Merge pull request #81 from loathers/deps

Fix tattoo detection bug (and update dependencies)
loathers · Jun 5, 2024 · 93c7a57 · 93c7a57
2 parents fdd7578 + 0acd727
commit 93c7a57
Show file tree

Hide file tree

Showing 20 changed files with 10,388 additions and 5,117 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -3,24 +3,21 @@
 
 name: Build & Lint
 
-on:
-  push:
-    branches: [main]
-  pull_request:
-    branches: [main]
+on: push
 
 env:
-  # Default version of Node.js for jobs
-  node-version: "18"
+  node-version: "22"
 
 jobs:
   lint:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Use Node.js ${{ env.node-version }}
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ env.node-version }}
-      - run: yarn install --frozen-lockfile
+      - run: corepack enable
+      - run: yarn install --immutable
+      - run: yarn workspace greenbox-script test
diff --git a/.github/workflows/deploy_script.yml b/.github/workflows/deploy_script.yml
@@ -5,16 +5,23 @@ on:
       branches: [main]
   workflow_dispatch:
 
+env:
+  node-version: "22"
+
 jobs:
   build:
     runs-on: ubuntu-latest
     name: Build and Push
     steps:
-      - name: git-checkout
-        uses: actions/checkout@v3
+      - uses: actions/checkout@v4
+      - name: Use Node.js ${{ env.node-version }}
+        uses: actions/setup-node@v4
+        with:
+          node-version: ${{ env.node-version }}
+      - run: corepack enable
 
       - name: Install dependencies
-        run: yarn install --frozen-lockfile
+        run: yarn install --immutable
 
       - name: Build script
         run: yarn workspace greenbox-script run build

diff --git a/.github/workflows/deploy_web.yml b/.github/workflows/deploy_web.yml
@@ -5,6 +5,9 @@ on:
       branches: [main]
   workflow_dispatch:
 
+env:
+  node-version: "22"
+
 permissions:
   contents: write
 
@@ -13,12 +16,16 @@ jobs:
     concurrency: ci-${{ github.ref }}
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout
-        uses: actions/checkout@v3
+      - uses: actions/checkout@v4
+      - name: Use Node.js ${{ env.node-version }}
+        uses: actions/setup-node@v4
+        with:
+          node-version: ${{ env.node-version }}
+      - run: corepack enable
 
       - name: Build
         run: |
-          yarn install --frozen-lockfile
+          yarn install --immutable
           yarn workspace greenbox-web run build
 
       - name: Deploy

diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,13 @@
 node_modules
 .DS_Store
 build/
-.vscode
+.vscode
+
+# Yarn without Zero-Installs
+.pnp.*
+.yarn/*
+!.yarn/patches
+!.yarn/plugins
+!.yarn/releases
+!.yarn/sdks
+!.yarn/versions
diff --git a/.yarnrc.yml b/.yarnrc.yml
@@ -0,0 +1 @@
+nodeLinker: node-modules
diff --git a/package.json b/package.json
@@ -5,11 +5,12 @@
     "packages/*"
   ],
   "devDependencies": {
-    "@trivago/prettier-plugin-sort-imports": "^4.2.0",
-    "prettier": "^3.0.3"
+    "@trivago/prettier-plugin-sort-imports": "^4.3.0",
+    "prettier": "^3.3.0"
   },
   "scripts": {
     "build": "yarn workspace greenbox-script run build && yarn workspace greenbox-web run build",
-    "format": "yarn workspaces run format"
-  }
+    "format": "yarn workspaces foreach --all run format"
+  },
+  "packageManager": "yarn@4.2.1"
 }
diff --git a/packages/greenbox-data/data/iotms.ts b/packages/greenbox-data/data/iotms.ts
@@ -1,4 +1,4 @@
-import { BooleanProperty } from "libram/dist/propertyTypes";
+import { KnownProperty } from "libram";
 
 interface BaseIotM {
   id: number;
@@ -49,7 +49,7 @@ interface PreferenceIotM extends BaseIotM {
   /**
    * Preference to check. If it contains "true" the IotM will be considered owned.
    */
-  preference: BooleanProperty;
+  preference: KnownProperty;
 }
 
 interface SkillIotM extends BaseIotM {

diff --git a/packages/greenbox-data/package.json b/packages/greenbox-data/package.json
@@ -18,6 +18,7 @@
     "type": "git",
     "url": "git+https://github.com/loathers/greenbox.git"
   },
+  "type": "module",
   "scripts": {
     "test": "echo \"Error: run tests from root\" && exit 1",
     "format": "prettier --write ."
@@ -26,15 +27,15 @@
     "url": "https://github.com/loathers/greenbox/issues"
   },
   "devDependencies": {
-    "@trivago/prettier-plugin-sort-imports": "^4.2.0",
-    "@typescript-eslint/eslint-plugin": "^6.6.0",
-    "@typescript-eslint/parser": "^6.6.0",
-    "eslint": "^8.49.0",
-    "eslint-config-prettier": "^9.0.0",
-    "eslint-plugin-prettier": "^5.0.0",
+    "@trivago/prettier-plugin-sort-imports": "^4.3.0",
+    "@typescript-eslint/eslint-plugin": "^7.12.0",
+    "@typescript-eslint/parser": "^7.12.0",
+    "eslint": "^8.57.0",
+    "eslint-config-prettier": "^9.1.0",
+    "eslint-plugin-prettier": "^5.1.3",
     "greenbox-prettier-config": "^0.0.0",
-    "prettier": "^3.0.3",
-    "typescript": "^5.2.2"
+    "prettier": "^3.3.0",
+    "typescript": "^5.4.5"
   },
   "prettier": "greenbox-prettier-config",
   "dependencies": {

diff --git a/packages/greenbox-prettier-config/package.json b/packages/greenbox-prettier-config/package.json
@@ -16,8 +16,8 @@
     "url": "git+https://github.com/loathers/greenbox.git"
   },
   "devDependencies": {
-    "@trivago/prettier-plugin-sort-imports": "^4.2.0",
-    "prettier": "^3.0.3"
+    "@trivago/prettier-plugin-sort-imports": "^4.3.0",
+    "prettier": "^3.3.0"
   },
   "peerDependencies": {
     "@trivago/prettier-plugin-sort-imports": "^4.2.0",

diff --git a/packages/greenbox-script/babel.config.js b/packages/greenbox-script/babel.config.js
@@ -15,8 +15,8 @@ module.exports = function (api) {
       ],
     ],
     plugins: [
-      "@babel/plugin-proposal-class-properties",
-      "@babel/plugin-proposal-object-rest-spread",
+      "@babel/plugin-transform-class-properties",
+      "@babel/plugin-transform-object-rest-spread",
     ],
   };
 };
diff --git a/packages/greenbox-script/package.json b/packages/greenbox-script/package.json
@@ -5,36 +5,39 @@
   "author": "Sam Gaus <sam@gaus.co.uk>",
   "homepage": "",
   "license": "ISC",
-  "main": "dist/greenbox.ts",
+  "main": "dist/greenbox.js",
+  "type": "module",
   "scripts": {
     "build": "node build.mjs",
     "format": "prettier --write .",
-    "watch": "node build.mjs --watch"
+    "watch": "node build.mjs --watch",
+    "test": "vitest"
   },
   "dependencies": {
     "greenbox-data": "^0.0.0",
-    "kolmafia": "^5.27741.0",
-    "libram": "^0.8.18"
+    "kolmafia": "^5.27965.0",
+    "libram": "^0.8.37"
   },
   "devDependencies": {
-    "@babel/core": "^7.23.6",
-    "@babel/plugin-proposal-class-properties": "^7.18.6",
-    "@babel/plugin-proposal-object-rest-spread": "^7.18.9",
-    "@babel/preset-env": "^7.23.6",
-    "@babel/preset-typescript": "^7.23.3",
+    "@babel/core": "^7.24.6",
+    "@babel/plugin-transform-class-properties": "^7.24.6",
+    "@babel/plugin-transform-object-rest-spread": "^7.24.6",
+    "@babel/preset-env": "^7.24.6",
+    "@babel/preset-typescript": "^7.24.6",
     "@trivago/prettier-plugin-sort-imports": "^4.3.0",
-    "@types/node": "^20.10.5",
-    "@typescript-eslint/eslint-plugin": "^6.15.0",
-    "@typescript-eslint/parser": "^6.15.0",
-    "esbuild": "^0.19.9",
+    "@types/node": "^20.14.2",
+    "@typescript-eslint/eslint-plugin": "^7.12.0",
+    "@typescript-eslint/parser": "^7.12.0",
+    "esbuild": "^0.21.4",
     "esbuild-plugin-babel": "^0.2.3",
-    "eslint": "^8.56.0",
+    "eslint": "^8.57.0",
     "eslint-config-prettier": "^9.1.0",
-    "eslint-plugin-libram": "^0.4.0",
-    "eslint-plugin-prettier": "^5.0.1",
+    "eslint-plugin-libram": "^0.4.8",
+    "eslint-plugin-prettier": "^5.1.3",
     "greenbox-prettier-config": "^0.0.0",
-    "prettier": "^3.1.1",
-    "typescript": "^5.3.3"
+    "prettier": "^3.3.0",
+    "typescript": "^5.4.5",
+    "vitest": "^1.6.0"
   },
   "prettier": "greenbox-prettier-config"
 }