Skip to content

Commit

Permalink
Merge branch 'release/v3.6.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
kitce committed Jun 12, 2022
2 parents 529ff4f + 347d163 commit fae5388
Show file tree
Hide file tree
Showing 16 changed files with 217 additions and 218 deletions.
2 changes: 1 addition & 1 deletion .cz.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ commitizen:
name: cz_conventional_commits
tag_format: v$version
update_changelog_on_bump: true
version: 3.6.1
version: 3.6.2
version_files:
- package.json
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
## v3.6.2 (2022-06-12)

### Fix

- **label-form**: unexpected screenshot behaviour

### Refactor

- **typings**: revise `waitForElement` types

## v3.6.1 (2022-06-01)

### Fix
Expand Down
7 changes: 6 additions & 1 deletion config/webpack/webpack.config.base.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import path from 'path';
import type webpack from 'webpack';
import { publicURL } from '../config';
import environment from './plugins/environment';
Expand All @@ -7,7 +8,11 @@ import typescript from './rules/typescript';

const config: webpack.Configuration = {
resolve: {
extensions: ['.ts', '.tsx', '.js']
extensions: ['.ts', '.tsx', '.js'],
alias: {
/* to fix invalid hook call warning when using `pnpm link` */
react: path.resolve('./node_modules/react')
}
},
output: {
filename: '[name].js',
Expand Down
4 changes: 2 additions & 2 deletions dist/libel.js.LICENSE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@
*/

/*!
* html2canvas 1.3.2 <https://html2canvas.hertzen.com>
* Copyright (c) 2021 Niklas von Hertzen <https://hertzen.com>
* html2canvas 1.4.1 <https://html2canvas.hertzen.com>
* Copyright (c) 2022 Niklas von Hertzen <https://hertzen.com>
* Released under MIT License
*/

Expand Down
2 changes: 1 addition & 1 deletion dist/libel.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/libel.meta.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// ==UserScript==
// @name Libel
// @version 3.6.1
// @version 3.6.2
// @author kitce <[email protected]>
// @description Label users on LIHKG
// @homepage https://kitce.github.io/libel
Expand Down
4 changes: 2 additions & 2 deletions dist/libel.user.js

Large diffs are not rendered by default.

15 changes: 9 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "libel",
"namespace": "libel",
"displayName": "Libel",
"version": "3.6.1",
"version": "3.6.2",
"description": "Label users on LIHKG",
"author": "kitce <[email protected]>",
"repository": {
Expand Down Expand Up @@ -35,25 +35,26 @@
"@fortawesome/free-regular-svg-icons": "^6.1.1",
"@fortawesome/free-solid-svg-icons": "^6.1.1",
"@fortawesome/react-fontawesome": "^0.1.18",
"@kitce/react-use-fadeout-scroll": "^2.0.0",
"@reduxjs/toolkit": "^1.5.1",
"classnames": "^2.3.1",
"crypto-js": "^4.1.1",
"date-fns": "^2.27.0",
"debug": "^4.3.3",
"events": "^3.3.0",
"focus-trap-react": "^8.8.2",
"html2canvas": "^1.0.0-rc.7",
"html2canvas": "^1.4.1",
"immer": "^8.0.1",
"joi": "^17.4.0",
"js-cookie": "^3.0.1",
"localforage": "^1.9.0",
"lodash": "^4.17.21",
"lz-string": "^1.3.34",
"mustache": "^4.2.0",
"react": "^18.0.0",
"react": "^18.1.0",
"react-dnd": "^16.0.0",
"react-dnd-html5-backend": "^16.0.0",
"react-dom": "^18.0.0",
"react-dom": "^18.1.0",
"react-redux": "^7.2.3",
"react-use": "^17.3.1",
"redux-persist": "^6.0.0",
Expand All @@ -71,13 +72,15 @@
"@types/gapi.client.drive": "^3.0.13",
"@types/gtag.js": "^0.0.8",
"@types/jest": "^27.4.1",
"@types/js-cookie": "^3.0.2",
"@types/lodash": "^4.14.168",
"@types/lz-string": "^1.3.34",
"@types/mustache": "^4.1.1",
"@types/node": "^12.18.3",
"@types/postcss-preset-env": "^6.7.2",
"@types/react": "^18.0.0",
"@types/react-dom": "^18.0.0",
"@types/react": "^18.0.10",
"@types/react-dom": "^18.0.5",
"@types/react-redux": "^7.1.24",
"@types/redux-state-sync": "^3.1.1",
"@types/sass": "^1.16.0",
"@types/semver": "^7.3.6",
Expand Down
Loading

0 comments on commit fae5388

Please sign in to comment.