Skip to content

Commit 04b5b3c

Browse files
hipstersmoothiehipstersmoothie
committed
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
2 parents 6bd9da5 + a4a8d63 commit 04b5b3c

File tree

8 files changed

+234
-77
lines changed

8 files changed

+234
-77
lines changed

‎.all-contributorsrc

+9
Original file line numberDiff line numberDiff line change
@@ -1319,6 +1319,15 @@
13191319
"contributions": [
13201320
"doc"
13211321
]
1322+
},
1323+
{
1324+
"login": "DLiblik",
1325+
"name": "Dathan",
1326+
"avatar_url": "https://avatars.githubusercontent.com/u/4047997?v=4",
1327+
"profile": "https://ca.linkedin.com/in/dathanliblik",
1328+
"contributions": [
1329+
"code"
1330+
]
13221331
}
13231332
],
13241333
"contributorsPerLine": 7,

‎.github/workflows/build.yml

+73-72
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,26 @@ name: build
22

33
on:
44
push:
5-
branches: [main]
5+
branches:
6+
- main
67
pull_request:
78
types:
89
- opened
910
- reopened
1011
- synchronize
1112

1213
# Enabled permissions on GITHUB_TOKEN
13-
# permissions:
14-
# # To be able to push to the repo
15-
# contents: write
16-
# # To update the pr description with canary info
17-
# pull-requests: write
18-
# # For pr-check to create a status
19-
# statuses: write
20-
# # Needed to create PR statuses/checks
21-
# checks: write
22-
# # To post comments on PRs
23-
# issues: write
14+
permissions:
15+
# To be able to push to the repo
16+
contents: write
17+
# To update the pr description with canary info
18+
pull-requests: write
19+
# For pr-check to create a status
20+
statuses: write
21+
# Needed to create PR statuses/checks
22+
checks: write
23+
# To post comments on PRs
24+
issues: write
2425

2526
jobs:
2627
# Run install in one step so deps can be cached for other steps
@@ -30,68 +31,68 @@ jobs:
3031
- uses: actions/checkout@v3
3132
# - uses: ./.github/actions/install-deps
3233

33-
# build:
34-
# runs-on: ubuntu-latest
35-
# needs: install
36-
# steps:
37-
# - uses: actions/checkout@v3
38-
# - uses: ./.github/actions/install-deps
39-
# - uses: ./.github/actions/build-cache
40-
# - run: yarn build
34+
build:
35+
runs-on: ubuntu-latest
36+
needs: install
37+
steps:
38+
- uses: actions/checkout@v3
39+
- uses: ./.github/actions/install-deps
40+
- uses: ./.github/actions/build-cache
41+
- run: pnpm build
4142

42-
# lint:
43-
# runs-on: ubuntu-latest
44-
# needs: build
45-
# steps:
46-
# - uses: actions/checkout@v3
47-
# - uses: ./.github/actions/install-deps
48-
# - uses: ./.github/actions/build-cache
49-
# - run: yarn lint
43+
lint:
44+
runs-on: ubuntu-latest
45+
needs: build
46+
steps:
47+
- uses: actions/checkout@v3
48+
- uses: ./.github/actions/install-deps
49+
- uses: ./.github/actions/build-cache
50+
- run: pnpm lint
5051

51-
# test-types:
52-
# runs-on: ubuntu-latest
53-
# needs: build
54-
# steps:
55-
# - uses: actions/checkout@v3
56-
# - uses: ./.github/actions/install-deps
57-
# - uses: ./.github/actions/build-cache
58-
# - run: yarn tsTest:custom && yarn tsTest:main
52+
test-types:
53+
runs-on: ubuntu-latest
54+
needs: build
55+
steps:
56+
- uses: actions/checkout@v3
57+
- uses: ./.github/actions/install-deps
58+
- uses: ./.github/actions/build-cache
59+
- run: pnpm tsTest:custom && pnpm tsTest:main
5960

60-
# test:
61-
# runs-on: ubuntu-latest
62-
# needs: build
63-
# steps:
64-
# - uses: actions/checkout@v3
65-
# - uses: ./.github/actions/install-deps
66-
# - uses: ./.github/actions/build-cache
67-
# - run: yarn test
61+
test:
62+
runs-on: ubuntu-latest
63+
needs: build
64+
steps:
65+
- uses: actions/checkout@v3
66+
- uses: ./.github/actions/install-deps
67+
- uses: ./.github/actions/build-cache
68+
- run: pnpm test
6869

69-
# test-browser:
70-
# runs-on: ubuntu-latest
71-
# needs: build
72-
# if: ${{ false }} # disable for now
73-
# steps:
74-
# - uses: actions/checkout@v3
75-
# - uses: ./.github/actions/install-deps
76-
# - uses: ./.github/actions/build-cache
77-
# - run: yarn test:browser --ci
70+
test-browser:
71+
runs-on: ubuntu-latest
72+
needs: build
73+
if: ${{ false }} # disable for now
74+
steps:
75+
- uses: actions/checkout@v3
76+
- uses: ./.github/actions/install-deps
77+
- uses: ./.github/actions/build-cache
78+
- run: pnpm test:browser --ci
7879

79-
# release:
80-
# runs-on: ubuntu-latest
81-
# if: contains(github.event.head_commit.message , 'ci skip') == false && contains(github.event.head_commit.message , 'skip ci') == false
82-
# needs: build
83-
# steps:
84-
# - uses: actions/checkout@v3
85-
# - uses: 8BitJonny/[email protected]
86-
# id: PR
87-
# - uses: ./.github/actions/install-deps
88-
# - uses: ./.github/actions/build-cache
89-
# - name: Prepare repository
90-
# run: git fetch --unshallow --tags
91-
# - name: Create Release
92-
# run: yarn auto shipit
93-
# env:
94-
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
95-
# PROTECTED_BRANCH_REVIEWER_TOKEN: ${{ secrets.GH_TOKEN }}
96-
# NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
97-
# PR: ${{ steps.PR.outputs.number }}
80+
release:
81+
runs-on: ubuntu-latest
82+
if: contains(github.event.head_commit.message , 'ci skip') == false && contains(github.event.head_commit.message , 'skip ci') == false
83+
needs: build
84+
steps:
85+
- uses: actions/checkout@v3
86+
- uses: 8BitJonny/[email protected]
87+
id: PR
88+
- uses: ./.github/actions/install-deps
89+
- uses: ./.github/actions/build-cache
90+
- name: Prepare repository
91+
run: git fetch --unshallow --tags
92+
- name: Create Release
93+
run: pnpm auto shipit
94+
env:
95+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
96+
PROTECTED_BRANCH_REVIEWER_TOKEN: ${{ secrets.GH_TOKEN }}
97+
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
98+
PR: ${{ steps.PR.outputs.number }}

‎CHANGELOG.md

+23
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,26 @@
1+
# v0.22.12 (Fri Feb 23 2024)
2+
3+
:tada: This release contains work from a new contributor! :tada:
4+
5+
Thank you, Dathan ([@DLiblik](https://github.com/DLiblik)), for all your work!
6+
7+
#### 🚀 Enhancement
8+
9+
- 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]))
10+
11+
#### 🐛 Bug Fix
12+
13+
- `@jimp/core`
14+
- Improve color operations performance [#1263](https://github.com/jimp-dev/jimp/pull/1263) ([@DLiblik](https://github.com/DLiblik) [@hipstersmoothie](https://github.com/hipstersmoothie))
15+
16+
#### Authors: 3
17+
18+
- [@github-actions[bot]](https://github.com/github-actions[bot])
19+
- Andrew Lisowski ([@hipstersmoothie](https://github.com/hipstersmoothie))
20+
- Dathan ([@DLiblik](https://github.com/DLiblik))
21+
22+
---
23+
124
# v0.22.11 (Fri Feb 23 2024)
225

326
:tada: This release contains work from new contributors! :tada:

‎README.md

+1
Original file line numberDiff line numberDiff line change
@@ -211,6 +211,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
211211
<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>
212212
<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>
213213
<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>
214+
<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>
214215
</tr>
215216
</table>
216217

‎lerna.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"lerna": "^7.1.4",
3-
"npmClient": "yarn",
3+
"npmClient": "pnpm",
44
"registry": "https://registry.npmjs.org/",
5-
"version": "0.22.11",
5+
"version": "0.22.12",
66
"packages": ["packages/*"]
77
}

‎packages/read-file/package.json

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
"devDependencies": {
1313
"@jimp/config-eslint": "workspace:*",
1414
"@jimp/config-typescript": "workspace:*",
15+
"@types/node": "^20.12.5",
1516
"eslint": "^8.57.0",
1617
"tshy": "^1.12.0",
1718
"typescript": "^5.4.2",

‎packages/read-file/src/index.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
export { existsSync } from "node:fs";
2-
import { promises as fs } from "node:fs";
1+
export { existsSync } from "fs";
2+
import { promises as fs } from "fs";
33

44
export const readFile = fs.readFile;

0 commit comments

Comments
 (0)