Use Node 16 in CI (#1518)

* Use Node 16 in CI * Fix lint errors
oblador · Jul 17, 2023 · 944b0b9 · 944b0b9
1 parent 35976b0
commit 944b0b9
Show file tree

Hide file tree

Showing 6 changed files with 2,997 additions and 2,947 deletions.
diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml
@@ -12,9 +12,9 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: Use Node.js
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v3
         with:
-          node-version: '14.x'
+          node-version-file: ".node-version"
           registry-url: 'https://registry.npmjs.org'
       - name: Install dependencies
         run: yarn --frozen-lockfile --non-interactive --silent
@@ -30,9 +30,9 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: Use Node.js
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v3
         with:
-          node-version: '14.x'
+          node-version-file: ".node-version"
       - name: Install dependencies
         run: yarn --frozen-lockfile --non-interactive --silent
         working-directory: directory

diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -12,9 +12,9 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: Use Node.js
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v3
         with:
-          node-version: '14.x'
+          node-version-file: ".node-version"
       - name: Install dependencies
         run: yarn --frozen-lockfile --non-interactive --silent --ignore-scripts
       - name: Lint files

diff --git a/.node-version b/.node-version
@@ -0,0 +1 @@
+16.18.0
diff --git a/bin/generate-ionicons.js b/bin/generate-ionicons.js
@@ -5,7 +5,7 @@ const glob = require('glob');
 const xml2js = require('xml2js');
 
 const SVGIcons2SVGFontStream = require('svgicons2svgfont');
-const SVGIconsDirStream = require('svgicons2svgfont/src/iconsdir.js');
+const SVGIconsDirStream = require('svgicons2svgfont/src/iconsdir');
 
 const svg2ttf = require('svg2ttf');
 

diff --git a/lib/create-icon-set-from-fontawesome6.js b/lib/create-icon-set-from-fontawesome6.js
@@ -35,7 +35,7 @@ function createFA6iconSet(glyphMap, metadata = {}, pro = false) {
 
   function createFontAwesomeStyle(style, fontWeight, family = fontFamily) {
     let styleName = style;
-    let fontFile = `FontAwesome6_${pro ? `Pro_${styleName}` : styleName}.ttf`;
+    const fontFile = `FontAwesome6_${pro ? `Pro_${styleName}` : styleName}.ttf`;
 
     if (styleName === 'Brands') {
       styleName = 'Regular';
@@ -58,12 +58,20 @@ function createFA6iconSet(glyphMap, metadata = {}, pro = false) {
     };
   }
 
-  const brandIcons = createFontAwesomeStyle('Brands', '400', 'FontAwesome6Brands');
+  const brandIcons = createFontAwesomeStyle(
+    'Brands',
+    '400',
+    'FontAwesome6Brands'
+  );
   const lightIcons = createFontAwesomeStyle('Light', '300');
   const regularIcons = createFontAwesomeStyle('Regular', '400');
   const solidIcons = createFontAwesomeStyle('Solid', '900');
   const sharpSolidIcons = createFontAwesomeStyle('Sharp_Solid', '900');
-  const duotoneIcons = createFontAwesomeStyle('Duotone', '900', 'FontAwesome6Duotone');
+  const duotoneIcons = createFontAwesomeStyle(
+    'Duotone',
+    '900',
+    'FontAwesome6Duotone'
+  );
   const thinIcons = createFontAwesomeStyle('Thin', '100');
   const Icon = createMultiStyleIconSet(
     {