Merge pull request #25 from dabico/refactoring/esm

Author: dabico

.github/workflows/publish.yml

@@ -3,7 +3,7 @@ on:
   push:
     tags:
       - 'v*'
-  workflow_dispatch:
+
 jobs:
   publish:
     runs-on: ubuntu-latest
@@ -13,12 +13,12 @@ jobs:
       - name: Setup Node
         uses: actions/setup-node@v4
         with:
-          node-version: '18'
+          node-version: '20'
           registry-url: 'https://registry.npmjs.org'
       - name: Install dependencies
         run: npm clean-install
       - name: Generate CSS files
-        run: npm run generate
+        run: npm run build
       - name: Prepare files
         run: |
           mkdir octicons
@@ -39,5 +39,3 @@ jobs:
         if: startsWith(github.ref, 'refs/tags/')
         with:
           files: octicons.tar.gz
-      - name: Clean up generated files
-        run: npm run clean

.idea/runConfigurations/generate.xml .idea/runConfigurations/build.xml

@@ -0,0 +1,11 @@
+{
+    "endOfLine": "lf",
+    "printWidth": 120,
+    "tabWidth": 4,
+    "useTabs": false,
+    "singleQuote": false,
+    "arrowParens": "always",
+    "trailingComma": "all",
+    "bracketSpacing": true,
+    "semi": true
+}

.prettierrc.js

@@ -1,22 +1,29 @@
+import js from "@eslint/js";
+import globals from "globals";
+import recommendedConfig from "eslint-plugin-prettier/recommended";
+import eslintConfigPrettier from "eslint-config-prettier";
+
+const { rules: prettierRules } = eslintConfigPrettier;
+const prettierConfigsRecommended = recommendedConfig;
 const {
-    configs: { recommended: jsConfigRecommended },
-} = require("@eslint/js");
-const { node, es2024 } = require("globals");
-const esLintConfigPrettier = require("eslint-config-prettier");
-const prettierRecommended = require("eslint-plugin-prettier/recommended");
+    configs: { recommended: jsConfigsRecommended },
+} = js;
 
-module.exports = [
-    jsConfigRecommended,
-    prettierRecommended,
-    esLintConfigPrettier,
+export default [
+    jsConfigsRecommended,
+    prettierConfigsRecommended,
     {
-        files: ["**/*.js"],
+        files: ["**/*.js", "octicons-css"],
         languageOptions: {
-            sourceType: "commonjs",
+            sourceType: "module",
             ecmaVersion: 2024,
-            globals: { ...node, ...es2024 },
+            globals: {
+                ...globals.node,
+                ...globals.es2024,
+            },
         },
         rules: {
+            ...prettierRules,
             "no-unused-vars": [
                 "error",
                 {

.prettierrc.json

@@ -0,0 +1,34 @@
+#!/usr/bin/env node
+import CleanCSS from "clean-css";
+import { mkdir, writeFile } from "node:fs/promises";
+import { FontAssetType, generateFonts, OtherAssetType } from "fantasticon";
+
+await mkdir("./fonts", { recursive: true });
+await generateFonts({
+    inputDir: "./node_modules/@primer/octicons/build/svg",
+    outputDir: ".",
+    name: "octicons",
+    fontTypes: [
+        FontAssetType.EOT,
+        FontAssetType.WOFF2,
+        FontAssetType.WOFF,
+    ],
+    assetTypes: [OtherAssetType.CSS],
+    pathOptions: {
+        woff: `./fonts/octicons.woff`,
+        woff2: `./fonts/octicons.woff2`,
+        eot: `./fonts/octicons.eot`,
+    },
+    fontHeight: 300,
+    descent: undefined,
+    normalize: true,
+    round: undefined,
+    selector: null,
+    tag: "i",
+    templates: { css: "./octicons.css.hbs" },
+    fontsUrl: "./fonts",
+    prefix: "octicon",
+});
+
+const { styles } = await new CleanCSS({ returnPromise: true }).minify(["./octicons.css"]);
+await writeFile("./octicons.min.css", styles, { flag: "w+" });