Upgrade everything (#44)

* Bump flakes

* bump gh actions

* update everything

* update yarn sdks

* lint fix

.envrc

@@ -1,4 +1,3 @@
 watch_file flake.nix
 watch_file flake.lock
-mkdir -p .direnv
-eval "$(nix print-dev-env --profile "$(direnv_layout_dir)/flake-profile")"
+use flake

.github/workflows/generate.yml

@@ -17,13 +17,13 @@ jobs:
     name: Sync
 
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
       - name: Get yarn cache directory path
         id: yarn-cache-dir-path
         run: echo "::set-output name=dir::$(yarn config get cacheFolder)"
       - name: Yarn Cache
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
           key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}

.github/workflows/lint.yml

@@ -13,13 +13,13 @@ jobs:
     runs-on: ubuntu-latest
     name: Check
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
       - name: Get yarn cache directory path
         id: yarn-cache-dir-path
         run: echo "dir=$(yarn config get cacheFolder)" >> $GITHUB_OUTPUT
       - name: Yarn Cache
-        uses: actions/cache@v3.0.11
+        uses: actions/cache@v3
         with:
           path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
           key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}

.prettierrc

@@ -0,0 +1 @@
+{}

.vscode/settings.json

@@ -6,5 +6,5 @@
   "eslint.nodePath": ".yarn/sdks",
   "typescript.tsdk": ".yarn/sdks/typescript/lib",
   "typescript.enablePromptUseWorkspaceTsdk": true,
-  "prettier.prettierPath": ".yarn/sdks/prettier/index.js"
+  "prettier.prettierPath": ".yarn/sdks/prettier/index.cjs"
 }

.yarn/sdks/eslint/lib/unsupported-api.js

@@ -0,0 +1,20 @@
+#!/usr/bin/env node
+
+const {existsSync} = require(`fs`);
+const {createRequire} = require(`module`);
+const {resolve} = require(`path`);
+
+const relPnpApiPath = "../../../../.pnp.cjs";
+
+const absPnpApiPath = resolve(__dirname, relPnpApiPath);
+const absRequire = createRequire(absPnpApiPath);
+
+if (existsSync(absPnpApiPath)) {
+  if (!process.versions.pnp) {
+    // Setup the environment to be able to require eslint/use-at-your-own-risk
+    require(absPnpApiPath).setup();
+  }
+}
+
+// Defer to the real eslint/use-at-your-own-risk your application uses
+module.exports = absRequire(`eslint/use-at-your-own-risk`);

.yarn/sdks/eslint/package.json

@@ -1,6 +1,14 @@
 {
   "name": "eslint",
-  "version": "8.26.0-sdk",
+  "version": "8.54.0-sdk",
   "main": "./lib/api.js",
-  "type": "commonjs"
+  "type": "commonjs",
+  "bin": {
+    "eslint": "./bin/eslint.js"
+  },
+  "exports": {
+    "./package.json": "./package.json",
+    ".": "./lib/api.js",
+    "./use-at-your-own-risk": "./lib/unsupported-api.js"
+  }
 }

.yarn/sdks/prettier/bin/prettier.cjs

@@ -0,0 +1,20 @@
+#!/usr/bin/env node
+
+const {existsSync} = require(`fs`);
+const {createRequire} = require(`module`);
+const {resolve} = require(`path`);
+
+const relPnpApiPath = "../../../../.pnp.cjs";
+
+const absPnpApiPath = resolve(__dirname, relPnpApiPath);
+const absRequire = createRequire(absPnpApiPath);
+
+if (existsSync(absPnpApiPath)) {
+  if (!process.versions.pnp) {
+    // Setup the environment to be able to require prettier/bin/prettier.cjs
+    require(absPnpApiPath).setup();
+  }
+}
+
+// Defer to the real prettier/bin/prettier.cjs your application uses
+module.exports = absRequire(`prettier/bin/prettier.cjs`);

.yarn/sdks/prettier/index.js → .yarn/sdks/prettier/index.cjs

@@ -11,10 +11,10 @@ const absRequire = createRequire(absPnpApiPath);
 
 if (existsSync(absPnpApiPath)) {
   if (!process.versions.pnp) {
-    // Setup the environment to be able to require prettier/index.js
+    // Setup the environment to be able to require prettier
     require(absPnpApiPath).setup();
   }
 }
 
-// Defer to the real prettier/index.js your application uses
-module.exports = absRequire(`prettier/index.js`);
+// Defer to the real prettier your application uses
+module.exports = absRequire(`prettier`);

.yarn/sdks/prettier/package.json

@@ -1,6 +1,7 @@
 {
   "name": "prettier",
-  "version": "2.7.1-sdk",
-  "main": "./index.js",
-  "type": "commonjs"
+  "version": "3.1.0-sdk",
+  "main": "./index.cjs",
+  "type": "commonjs",
+  "bin": "./bin/prettier.cjs"
 }

.yarn/sdks/typescript/lib/tsserver.js

@@ -109,6 +109,8 @@ const moduleWrapper = tsserver => {
             str = `zip:${str}`;
           } break;
         }
+      } else {
+        str = str.replace(/^\/?/, process.platform === `win32` ? `` : `/`);
       }
     }
 

.yarn/sdks/typescript/lib/tsserverlibrary.js

@@ -109,6 +109,8 @@ const moduleWrapper = tsserver => {
             str = `zip:${str}`;
           } break;
         }
+      } else {
+        str = str.replace(/^\/?/, process.platform === `win32` ? `` : `/`);
       }
     }
 

.yarn/sdks/typescript/lib/typescript.js

@@ -11,10 +11,10 @@ const absRequire = createRequire(absPnpApiPath);
 
 if (existsSync(absPnpApiPath)) {
   if (!process.versions.pnp) {
-    // Setup the environment to be able to require typescript/lib/typescript.js
+    // Setup the environment to be able to require typescript
     require(absPnpApiPath).setup();
   }
 }
 
-// Defer to the real typescript/lib/typescript.js your application uses
-module.exports = absRequire(`typescript/lib/typescript.js`);
+// Defer to the real typescript your application uses
+module.exports = absRequire(`typescript`);

.yarn/sdks/typescript/package.json

@@ -1,6 +1,10 @@
 {
   "name": "typescript",
-  "version": "4.8.4-sdk",
+  "version": "5.3.2-sdk",
   "main": "./lib/typescript.js",
-  "type": "commonjs"
+  "type": "commonjs",
+  "bin": {
+    "tsc": "./bin/tsc",
+    "tsserver": "./bin/tsserver"
+  }
 }

.yarnrc.yml

@@ -1,3 +1,7 @@
+compressionLevel: mixed
+
+enableGlobalCache: false
+
 nodeLinker: pnp
 
-yarnPath: .yarn/releases/yarn-4.0.0-rc.26.cjs
+yarnPath: .yarn/releases/yarn-4.0.2.cjs

flake.nix

@@ -25,18 +25,22 @@
                 xorg.libX11
                 xorg.libXi
                 xorg.libXext
-                libGLU
                 zlib
                 libpng
                 nasm
                 cairo
                 pango
                 libuuid
                 librsvg
-              ] ++ (pkgs.lib.optionals (!pkgs.stdenv.isAarch64) [
+              ] ++ lib.optionals (!stdenv.isAarch64) [
                 glibc.out
                 glibc.static
-              ]);
+              ] ++ lib.optionals (!stdenv.isDarwin) [
+                libGLU
+              ] ++ lib.optionals stdenv.isDarwin [
+                darwin.apple_sdk_11_0.frameworks.CoreText
+              ];
+
               LD_LIBRARY_PATH = lib.makeLibraryPath [ libuuid ];
             };
         });

package.json

@@ -6,36 +6,35 @@
   "repository": "git@github.com:saber-hq/saber-lp-token-list-generator.git",
   "author": "Ian Macalinao <ian@saber.so>",
   "license": "AGPL-3.0",
-  "packageManager": "yarn@4.0.0-rc.26",
+  "packageManager": "yarn@4.0.2",
   "devDependencies": {
-    "@rushstack/eslint-patch": "^1.2.0",
-    "@saberhq/eslint-config": "^2.1.0",
-    "@types/bn.js": "^5.1.1",
-    "@types/eslint": "^8.4.8",
-    "@types/lodash": "^4.14.186",
-    "@types/node": "^18.11.7",
-    "@types/prettier": "^2.7.1",
+    "@rushstack/eslint-patch": "^1.6.0",
+    "@saberhq/eslint-config": "^3.2.0",
+    "@types/bn.js": "^5.1.5",
+    "@types/eslint": "^8.44.8",
+    "@types/lodash": "^4.14.202",
+    "@types/node": "^18.18.14",
+    "@types/prettier": "^3.0.0",
     "@types/sharp": "^0.31.0",
-    "eslint": "^8.26.0",
-    "eslint-import-resolver-node": "^0.3.6",
-    "eslint-plugin-import": "^2.26.0",
-    "husky": "^8.0.1",
-    "lint-staged": "^13.0.3",
-    "prettier": "^2.7.1",
+    "eslint": "^8.54.0",
+    "eslint-import-resolver-node": "^0.3.9",
+    "eslint-plugin-import": "^2.29.0",
+    "husky": "^8.0.3",
+    "lint-staged": "^15.1.0",
+    "prettier": "^3.1.0",
     "ts-node": "^10.9.1",
-    "typescript": "^4.8.4"
+    "typescript": "^5.3.2"
   },
   "dependencies": {
     "@saberhq/solana-contrib": "^1.14.9",
     "@saberhq/token-utils": "^1.14.9",
-    "@solana/web3.js": "^1.66.2",
     "axios": "^0.26.1",
     "bn.js": "^5.2.1",
-    "canvas": "^2.10.1",
+    "canvas": "^2.11.2",
     "jsbi": "^4.3.0",
     "lodash": "^4.17.21",
     "node-vibrant": "^3.2.1-alpha.1",
-    "sharp": "^0.31.1",
+    "sharp": "^0.31",
     "tiny-invariant": "^1.3.1"
   },
   "scripts": {
@@ -53,5 +52,10 @@
   "lint-staged": {
     "*.ts": "eslint --cache --fix",
     "*.{md,json,js,yml,yaml,html}": "prettier --write"
+  },
+  "dependenciesMeta": {
+    "sharp@0.33.0": {
+      "unplugged": true
+    }
   }
 }

src/createAssetLaunchBanner.ts

@@ -51,7 +51,7 @@ const drawImage = async ({
 };
 
 export const createAssetLaunchBanner = async (
-  token: TokenInfo
+  token: TokenInfo,
 ): Promise<{ png: Buffer; jpg: Buffer }> => {
   const launchBannerBG = await fs.readFile(`${__dirname}/launch-banner.svg`);
 
@@ -97,7 +97,7 @@ export const createAssetLaunchBanner = async (
     0,
     0,
     WIDTH,
-    HEIGHT
+    HEIGHT,
   );
 
   ctx.font = `bold 48px Inter`;
@@ -120,15 +120,15 @@ export const createAssetLaunchBanner = async (
       startX,
       startY,
       iconDim,
-      iconDim
+      iconDim,
     );
   }
 
   ctx.fillStyle = "white";
   ctx.fillText(
     token.symbol,
     startX + iconDim + 16,
-    startY + iconDim - textHeight / 2
+    startY + iconDim - textHeight / 2,
   );
 
   ctx.font = `medium 28px Inter`;

src/createDecimalWrapperTokenIcon.ts

@@ -38,7 +38,7 @@ const drawImage = async ({
       0,
       0,
       DIMENSION,
-      DIMENSION
+      DIMENSION,
     );
   } catch (e) {
     console.warn(`Unsupported image: ${url ?? ""}`, e);
@@ -47,7 +47,7 @@ const drawImage = async ({
 
 export const createDecimalWrapperTokenIcon = async (
   token: TokenInfo,
-  decimals: number
+  decimals: number,
 ): Promise<{ png: Buffer; jpg: Buffer }> => {
   const canvas = createCanvas(DIMENSION, DIMENSION);
   const ctx = canvas.getContext("2d");
@@ -73,7 +73,7 @@ export const createDecimalWrapperTokenIcon = async (
   ctx.fillText(
     decimals.toString(),
     DIMENSION / 2,
-    (DIMENSION * 7) / 8 + fontSize * 0.1
+    (DIMENSION * 7) / 8 + fontSize * 0.1,
   );
 
   const mask = await loadImage(`${__dirname}/mask.svg`);