Merge branch 'main' into andrew/v1

# Conflicts:
#	packages/core/CHANGELOG.md
#	packages/core/package.json
#	packages/custom/package.json
#	packages/jimp/package.json
#	packages/plugin-blit/package.json
#	packages/plugin-blur/package.json
#	packages/plugin-circle/package.json
#	packages/plugin-color/package.json
#	packages/plugin-contain/package.json
#	packages/plugin-cover/package.json
#	packages/plugin-crop/package.json
#	packages/plugin-displace/package.json
#	packages/plugin-dither/package.json
#	packages/plugin-fisheye/package.json
#	packages/plugin-flip/package.json
#	packages/plugin-gaussian/package.json
#	packages/plugin-invert/package.json
#	packages/plugin-mask/package.json
#	packages/plugin-normalize/package.json
#	packages/plugin-print/package.json
#	packages/plugin-resize/package.json
#	packages/plugin-rotate/package.json
#	packages/plugin-scale/package.json
#	packages/plugin-shadow/package.json
#	packages/plugin-threshold/package.json
#	packages/plugins/package.json
#	packages/test-utils/package.json
#	packages/type-bmp/package.json
#	packages/type-gif/package.json
#	packages/type-jpeg/package.json
#	packages/type-png/package.json
#	packages/type-tiff/package.json
#	packages/types/package.json
#	packages/utils/package.json

.all-contributorsrc

@@ -1319,6 +1319,15 @@
       "contributions": [
         "doc"
       ]
+    },
+    {
+      "login": "DLiblik",
+      "name": "Dathan",
+      "avatar_url": "https://avatars.githubusercontent.com/u/4047997?v=4",
+      "profile": "https://ca.linkedin.com/in/dathanliblik",
+      "contributions": [
+        "code"
+      ]
     }
   ],
   "contributorsPerLine": 7,

.github/workflows/build.yml

@@ -2,25 +2,26 @@ name: build
 
 on:
   push:
-    branches: [main]
+    branches:
+      - main
   pull_request:
     types:
       - opened
       - reopened
       - synchronize
 
 # Enabled permissions on GITHUB_TOKEN
-# permissions:
-#   # To be able to push to the repo
-#   contents: write
-#   # To update the pr description with canary info
-#   pull-requests: write
-#   # For pr-check to create a status
-#   statuses: write
-#   # Needed to create PR statuses/checks
-#   checks: write
-#   # To post comments on PRs
-#   issues: write
+permissions:
+  # To be able to push to the repo
+  contents: write
+  # To update the pr description with canary info
+  pull-requests: write
+  # For pr-check to create a status
+  statuses: write
+  # Needed to create PR statuses/checks
+  checks: write
+  # To post comments on PRs
+  issues: write
 
 jobs:
   # Run install in one step so deps can be cached for other steps
@@ -30,68 +31,68 @@ jobs:
       - uses: actions/checkout@v3
       # - uses: ./.github/actions/install-deps
 
-  # build:
-  #   runs-on: ubuntu-latest
-  #   needs: install
-  #   steps:
-  #     - uses: actions/checkout@v3
-  #     - uses: ./.github/actions/install-deps
-  #     - uses: ./.github/actions/build-cache
-  #     - run: yarn build
+  build:
+    runs-on: ubuntu-latest
+    needs: install
+    steps:
+      - uses: actions/checkout@v3
+      - uses: ./.github/actions/install-deps
+      - uses: ./.github/actions/build-cache
+      - run: pnpm build
 
-  # lint:
-  #   runs-on: ubuntu-latest
-  #   needs: build
-  #   steps:
-  #     - uses: actions/checkout@v3
-  #     - uses: ./.github/actions/install-deps
-  #     - uses: ./.github/actions/build-cache
-  #     - run: yarn lint
+  lint:
+    runs-on: ubuntu-latest
+    needs: build
+    steps:
+      - uses: actions/checkout@v3
+      - uses: ./.github/actions/install-deps
+      - uses: ./.github/actions/build-cache
+      - run: pnpm lint
 
-  # test-types:
-  #   runs-on: ubuntu-latest
-  #   needs: build
-  #   steps:
-  #     - uses: actions/checkout@v3
-  #     - uses: ./.github/actions/install-deps
-  #     - uses: ./.github/actions/build-cache
-  #     - run: yarn tsTest:custom && yarn tsTest:main
+  test-types:
+    runs-on: ubuntu-latest
+    needs: build
+    steps:
+      - uses: actions/checkout@v3
+      - uses: ./.github/actions/install-deps
+      - uses: ./.github/actions/build-cache
+      - run: pnpm tsTest:custom && pnpm tsTest:main
 
-  # test:
-  #   runs-on: ubuntu-latest
-  #   needs: build
-  #   steps:
-  #     - uses: actions/checkout@v3
-  #     - uses: ./.github/actions/install-deps
-  #     - uses: ./.github/actions/build-cache
-  #     - run: yarn test
+  test:
+    runs-on: ubuntu-latest
+    needs: build
+    steps:
+      - uses: actions/checkout@v3
+      - uses: ./.github/actions/install-deps
+      - uses: ./.github/actions/build-cache
+      - run: pnpm test
 
-  # test-browser:
-  #   runs-on: ubuntu-latest
-  #   needs: build
-  #   if: ${{ false }} # disable for now
-  #   steps:
-  #     - uses: actions/checkout@v3
-  #     - uses: ./.github/actions/install-deps
-  #     - uses: ./.github/actions/build-cache
-  #     - run: yarn test:browser --ci
+  test-browser:
+    runs-on: ubuntu-latest
+    needs: build
+    if: ${{ false }} # disable for now
+    steps:
+      - uses: actions/checkout@v3
+      - uses: ./.github/actions/install-deps
+      - uses: ./.github/actions/build-cache
+      - run: pnpm test:browser --ci
 
-  # release:
-  #   runs-on: ubuntu-latest
-  #   if: contains(github.event.head_commit.message , 'ci skip') == false && contains(github.event.head_commit.message , 'skip ci') == false
-  #   needs: build
-  #   steps:
-  #     - uses: actions/checkout@v3
-  #     - uses: 8BitJonny/gh-get-current-pr@2.2.0
-  #       id: PR
-  #     - uses: ./.github/actions/install-deps
-  #     - uses: ./.github/actions/build-cache
-  #     - name: Prepare repository
-  #       run: git fetch --unshallow --tags
-  #     - name: Create Release
-  #       run: yarn auto shipit
-  #       env:
-  #         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-  #         PROTECTED_BRANCH_REVIEWER_TOKEN: ${{ secrets.GH_TOKEN }}
-  #         NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
-  #         PR: ${{ steps.PR.outputs.number }}
+  release:
+    runs-on: ubuntu-latest
+    if: contains(github.event.head_commit.message , 'ci skip') == false && contains(github.event.head_commit.message , 'skip ci') == false
+    needs: build
+    steps:
+      - uses: actions/checkout@v3
+      - uses: 8BitJonny/gh-get-current-pr@2.2.0
+        id: PR
+      - uses: ./.github/actions/install-deps
+      - uses: ./.github/actions/build-cache
+      - name: Prepare repository
+        run: git fetch --unshallow --tags
+      - name: Create Release
+        run: pnpm auto shipit
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          PROTECTED_BRANCH_REVIEWER_TOKEN: ${{ secrets.GH_TOKEN }}
+          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
+          PR: ${{ steps.PR.outputs.number }}

CHANGELOG.md

@@ -1,3 +1,26 @@
+# v0.22.12 (Fri Feb 23 2024)
+
+:tada: This release contains work from a new contributor! :tada:
+
+Thank you, Dathan ([@DLiblik](https://github.com/DLiblik)), for all your work!
+
+#### 🚀 Enhancement
+
+- Automatic release [#1277](https://github.com/jimp-dev/jimp/pull/1277) ([@hipstersmoothie](https://github.com/hipstersmoothie) [@github-actions[bot]](https://github.com/github-actions[bot]))
+
+#### 🐛 Bug Fix
+
+- `@jimp/core`
+  - Improve color operations performance [#1263](https://github.com/jimp-dev/jimp/pull/1263) ([@DLiblik](https://github.com/DLiblik) [@hipstersmoothie](https://github.com/hipstersmoothie))
+
+#### Authors: 3
+
+- [@github-actions[bot]](https://github.com/github-actions[bot])
+- Andrew Lisowski ([@hipstersmoothie](https://github.com/hipstersmoothie))
+- Dathan ([@DLiblik](https://github.com/DLiblik))
+
+---
+
 # v0.22.11 (Fri Feb 23 2024)
 
 :tada: This release contains work from new contributors! :tada:

README.md

@@ -211,6 +211,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
     <td align="center"><a href="https://github.com/Marsup"><img src="https://avatars.githubusercontent.com/u/796194?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Nicolas Morel</b></sub></a><br /><a href="https://github.com/jimp-dev/jimp/commits?author=Marsup" title="Code">💻</a></td>
     <td align="center"><a href="https://github.com/stevezac-osu"><img src="https://avatars.githubusercontent.com/u/71655313?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Zach Stevenson</b></sub></a><br /><a href="https://github.com/jimp-dev/jimp/commits?author=stevezac-osu" title="Code">💻</a></td>
     <td align="center"><a href="https://github.com/AnotherPillow"><img src="https://avatars.githubusercontent.com/u/85362273?v=4?s=100" width="100px;" alt=""/><br /><sub><b>AnotherPillow</b></sub></a><br /><a href="https://github.com/jimp-dev/jimp/commits?author=AnotherPillow" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://ca.linkedin.com/in/dathanliblik"><img src="https://avatars.githubusercontent.com/u/4047997?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Dathan</b></sub></a><br /><a href="https://github.com/jimp-dev/jimp/commits?author=DLiblik" title="Code">💻</a></td>
   </tr>
 </table>
 

lerna.json

@@ -1,7 +1,7 @@
 {
   "lerna": "^7.1.4",
-  "npmClient": "yarn",
+  "npmClient": "pnpm",
   "registry": "https://registry.npmjs.org/",
-  "version": "0.22.11",
+  "version": "0.22.12",
   "packages": ["packages/*"]
 }

packages/read-file/package.json

@@ -12,6 +12,7 @@
   "devDependencies": {
     "@jimp/config-eslint": "workspace:*",
     "@jimp/config-typescript": "workspace:*",
+    "@types/node": "^20.12.5",
     "eslint": "^8.57.0",
     "tshy": "^1.12.0",
     "typescript": "^5.4.2",

packages/read-file/src/index.ts

@@ -1,4 +1,4 @@
-export { existsSync } from "node:fs";
-import { promises as fs } from "node:fs";
+export { existsSync } from "fs";
+import { promises as fs } from "fs";
 
 export const readFile = fs.readFile;