opensource/RSSHub
3
0
Fork 0
mirror of https://github.com/DIYgod/RSSHub.git synced 2026-08-31 01:01:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore(deps): update bbob packages to version 4.3.1 and clean up patches (#20323)

Browse Source 
* chore(deps): update @bbob packages to version 4.3.1 and clean up patches

* fix: ensure Docker logs command does not fail the workflow

* fix: simplify Dockerfile cleanup step by removing entire lib directory
This commit is contained in:
Tony
2025-10-18 05:35:49 +08:00
committed by GitHub
parent b1c74bd3e3
commit d6606fc111
10 changed files with 53 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.dockerignore
+4 -3
View File
@@ -3,12 +3,11 @@
.github
.husky
.idea
.idx
.vscode
Dockerfile*
LICENSE
Procfile
app-minimal
coverage
eslint-plugins
node_modules
test
@@ -24,6 +23,8 @@ test
.prettier*
.(yarn|npm|nvm)rc
*.md
Dockerfile*
LICENSE
app.json
eslint.config.mjs
docker-compose*
.github/workflows/docker-test-cont.yml
+1 -1
View File
@@ -116,7 +116,7 @@ jobs:
- name: Print Docker container logs
if: ${{ always() }}
run: docker logs rsshub # logs/combined.log? Not so readable...
run: docker logs rsshub || true # logs/combined.log? Not so readable...
fail-build:
name: Fail build
Dockerfile
+1 -2
View File
@@ -17,7 +17,6 @@ RUN \
fi;
COPY ./tsconfig.json /app/
COPY ./patches /app/patches
COPY ./pnpm-lock.yaml /app/
COPY ./package.json /app/
@@ -71,7 +70,7 @@ WORKDIR /app
RUN \
set -ex && \
pnpm build && \
find /app/lib -mindepth 1 -not -path "/app/lib/assets*" -exec rm -rf {} \; 2>/dev/null || true && \
rm -rf /app/lib && \
cp /app/scripts/docker/minify-docker.js /minifier/ && \
export PROJECT_ROOT=/app && \
node /minifier/minify-docker.js && \
package.json
+4 -16
View File
@@ -51,9 +51,9 @@
"*.yml": "eslint --cache --fix --concurrency auto"
},
"dependencies": {
"@bbob/html": "4.2.0",
"@bbob/plugin-helper": "4.2.0",
"@bbob/preset-html5": "4.2.0",
"@bbob/html": "4.3.1",
"@bbob/plugin-helper": "4.3.1",
"@bbob/preset-html5": "4.3.1",
"@hono/node-server": "1.19.5",
"@hono/zod-openapi": "0.19.10",
"@notionhq/client": "5.2.1",
@@ -141,7 +141,7 @@
"devDependencies": {
"@babel/preset-env": "7.28.3",
"@babel/preset-typescript": "7.27.1",
"@bbob/types": "4.2.0",
"@bbob/types": "4.3.1",
"@eslint/eslintrc": "3.3.1",
"@eslint/js": "9.37.0",
"@microsoft/eslint-formatter-sarif": "3.1.0",
@@ -202,11 +202,6 @@
},
"pnpm": {
"onlyBuiltDependencies": [
"@bbob/core",
"@bbob/parser",
"@bbob/plugin-helper",
"@bbob/preset",
"@bbob/preset-html5",
"bufferutil",
"core-js",
"es5-ext",
@@ -229,13 +224,6 @@
"safe-buffer": "npm:@nolyfill/safe-buffer@^1",
"safer-buffer": "npm:@nolyfill/safer-buffer@^1",
"side-channel": "npm:@nolyfill/side-channel@^1"
},
"patchedDependencies": {
"@bbob/core@4.2.0": "patches/@bbob__core@4.2.0.patch",
"@bbob/parser@4.2.0": "patches/@bbob__parser@4.2.0.patch",
"@bbob/plugin-helper@4.2.0": "patches/@bbob__plugin-helper@4.2.0.patch",
"@bbob/preset-html5@4.2.0": "patches/@bbob__preset-html5@4.2.0.patch",
"@bbob/preset@4.2.0": "patches/@bbob__preset@4.2.0.patch"
}
}
}
patches/@bbob__core@4.2.0.patch
-13
View File
@@ -1,13 +0,0 @@
diff --git a/es/index.js b/es/index.js
index 16a08f3ae8f30b8184f5e6decefdc1f66b0f1b64..aa97d18a201b2121ab5f865c60d5de9f5913eae6 100644
--- a/es/index.js
+++ b/es/index.js
@@ -1,6 +1,6 @@
import { parse } from '@bbob/parser';
-import { iterate, match } from './utils';
-import { C1, C2 } from './errors';
+import { iterate, match } from './utils.js';
+import { C1, C2 } from './errors.js';
export function createTree(tree, options) {
const extendedTree = tree;
extendedTree.messages = [
patches/@bbob__parser@4.2.0.patch
-36
View File
@@ -1,36 +0,0 @@
diff --git a/es/index.js b/es/index.js
index 0a57e06d66aee0c7beff10aa10e761d022b7429e..7a852c7f42b7bc839ed849932d3dfc7cb4662f31 100644
--- a/es/index.js
+++ b/es/index.js
@@ -1,4 +1,4 @@
export { TagNode } from '@bbob/plugin-helper';
-export { default } from './parse';
-export * from './parse';
-export * from './lexer';
+export { default } from './parse.js';
+export * from './parse.js';
+export * from './lexer.js';
diff --git a/es/lexer.js b/es/lexer.js
index 902594965355f31212cd7cedad6697829e144684..2ea20da6e1bd2a307b180d0b538884239c29b0b1 100644
--- a/es/lexer.js
+++ b/es/lexer.js
@@ -1,6 +1,6 @@
/* eslint-disable no-plusplus,no-param-reassign */ import { OPEN_BRAKET, CLOSE_BRAKET, QUOTEMARK, BACKSLASH, SLASH, SPACE, TAB, EQ, N } from '@bbob/plugin-helper';
-import { Token, TYPE_ATTR_NAME, TYPE_ATTR_VALUE, TYPE_NEW_LINE, TYPE_SPACE, TYPE_TAG, TYPE_WORD } from './Token';
-import { createCharGrabber, trimChar, unquote } from './utils';
+import { Token, TYPE_ATTR_NAME, TYPE_ATTR_VALUE, TYPE_NEW_LINE, TYPE_SPACE, TYPE_TAG, TYPE_WORD } from './Token.js';
+import { createCharGrabber, trimChar, unquote } from './utils.js';
// for cases <!-- -->
const EM = '!';
export function createTokenOfType(type, value, r = 0, cl = 0, p = 0, e = 0) {
diff --git a/es/parse.js b/es/parse.js
index f08044bf6033d209d79c3eae3db532d95e8c860c..81d170263a11a4896b67a3b3d310e9d5673db4c4 100644
--- a/es/parse.js
+++ b/es/parse.js
@@ -1,5 +1,5 @@
import { CLOSE_BRAKET, OPEN_BRAKET, TagNode, isTagNode } from "@bbob/plugin-helper";
-import { createLexer } from "./lexer";
+import { createLexer } from "./lexer.js";
class NodeList {
last() {
if (Array.isArray(this.n) && this.n.length > 0 && typeof this.n[this.n.length - 1] !== "undefined") {
patches/@bbob__plugin-helper@4.2.0.patch
-33
View File
@@ -1,33 +0,0 @@
diff --git a/es/TagNode.js b/es/TagNode.js
index d07d4cc7be7d9a3f9b0b82e7e20b0288be3518a3..255f7116432fe5e662004f769afd18a6a5be243d 100644
--- a/es/TagNode.js
+++ b/es/TagNode.js
@@ -1,5 +1,5 @@
-import { OPEN_BRAKET, CLOSE_BRAKET, SLASH } from './char';
-import { getUniqAttr, getNodeLength, appendToNode, attrsToString, attrValue, isTagNode } from './helpers';
+import { OPEN_BRAKET, CLOSE_BRAKET, SLASH } from './char.js';
+import { getUniqAttr, getNodeLength, appendToNode, attrsToString, attrValue, isTagNode } from './helpers.js';
const getTagAttrs = (tag, params)=>{
const uniqAttr = getUniqAttr(params);
if (uniqAttr) {
diff --git a/es/helpers.js b/es/helpers.js
index fbb27792e9ca04f460cb9d991df3803b8625c615..b10a9bb0d7ff51eb5ab9471b40d0055196c3ccf4 100644
--- a/es/helpers.js
+++ b/es/helpers.js
@@ -1,4 +1,4 @@
-import { N } from './char';
+import { N } from './char.js';
function isTagNode(el) {
return typeof el === 'object' && el !== null && 'tag' in el;
}
diff --git a/es/index.js b/es/index.js
index 3cfcb823c11fa6fdc7cef636d2c2ab2299cf8137..40253efe6a03b0e0ccfc0defc59c8a45370c5c90 100644
--- a/es/index.js
+++ b/es/index.js
@@ -1,3 +1,3 @@
-export * from "./helpers";
-export * from "./char";
-export * from "./TagNode";
+export * from "./helpers.js";
+export * from "./char.js";
+export * from "./TagNode.js";
patches/@bbob__preset-html5@4.2.0.patch
-9
View File
@@ -1,9 +0,0 @@
diff --git a/es/index.js b/es/index.js
index 5f5546ed7af8a8072b4ed57fc2a1b930318ea033..03a4087da2750ef174ad99ea4e06b4ca0030b716 100644
--- a/es/index.js
+++ b/es/index.js
@@ -1,3 +1,3 @@
/* eslint-disable indent */ import { createPreset } from "@bbob/preset";
-import defaultTags from "./defaultTags";
+import defaultTags from "./defaultTags.js";
export default createPreset(defaultTags);
patches/@bbob__preset@4.2.0.patch
-9
View File
@@ -1,9 +0,0 @@
diff --git a/es/index.js b/es/index.js
index 15a762cc5dc6ed026fccd76d3d655370da689929..53024b46da00d822a283ba6a51aa0800fe2fd59b 100644
--- a/es/index.js
+++ b/es/index.js
@@ -1,2 +1,2 @@
-export { default } from "./preset";
-export * from "./preset";
+export { default } from "./preset.js";
+export * from "./preset.js";
pnpm-lock.yaml
Generated
+43 -60
View File
@@ -14,36 +14,19 @@ overrides:
safer-buffer: npm:@nolyfill/safer-buffer@^1
side-channel: npm:@nolyfill/side-channel@^1
patchedDependencies:
'@bbob/core@4.2.0':
hash: 2145e7e74e896ed9a0245a5c0efc45359739aa9cf8f4f797557d74124c49dfe4
path: patches/@bbob__core@4.2.0.patch
'@bbob/parser@4.2.0':
hash: 58c1d33094ba97e82bb2d6f3aebe02293280282dc236ba5c0b4addffb079a5a6
path: patches/@bbob__parser@4.2.0.patch
'@bbob/plugin-helper@4.2.0':
hash: d40357c9c2cb427a75a812d7bc567abd246bd57a77fe38b15847556a626a5bca
path: patches/@bbob__plugin-helper@4.2.0.patch
'@bbob/preset-html5@4.2.0':
hash: 2dfb8d9be036009fcc315551cb39b08f478c9a279511267cf570a3486073d39b
path: patches/@bbob__preset-html5@4.2.0.patch
'@bbob/preset@4.2.0':
hash: 6d367f09bfaa669d1936b0d0da34a962fdd4fdf2cacc103a856dc5ba310abfed
path: patches/@bbob__preset@4.2.0.patch
importers:
.:
dependencies:
'@bbob/html':
specifier: 4.2.0
version: 4.2.0
specifier: 4.3.1
version: 4.3.1
'@bbob/plugin-helper':
specifier: 4.2.0
version: 4.2.0(patch_hash=d40357c9c2cb427a75a812d7bc567abd246bd57a77fe38b15847556a626a5bca)
specifier: 4.3.1
version: 4.3.1
'@bbob/preset-html5':
specifier: 4.2.0
version: 4.2.0(patch_hash=2dfb8d9be036009fcc315551cb39b08f478c9a279511267cf570a3486073d39b)
specifier: 4.3.1
version: 4.3.1
'@hono/node-server':
specifier: 1.19.5
version: 1.19.5(hono@4.10.1)
@@ -301,8 +284,8 @@ importers:
specifier: 7.27.1
version: 7.27.1(@babel/core@7.28.3)
'@bbob/types':
specifier: 4.2.0
version: 4.2.0
specifier: 4.3.1
version: 4.3.1
'@eslint/eslintrc':
specifier: 3.3.1
version: 3.3.1
@@ -1021,26 +1004,26 @@ packages:
resolution: {integrity: sha512-bkFqkLhh3pMBUQQkpVgWDWq/lqzc2678eUyDlTBhRqhCHFguYYGM0Efga7tYk4TogG/3x0EEl66/OQ+WGbWB/Q==}
engines: {node: '>=6.9.0'}
'@bbob/core@4.2.0':
resolution: {integrity: sha512-i5VUIO6xx+TCrBE8plQF9KpW1z+0QcCh9GawCCWYG9KcZrEsyRy57my5/kem0a2lFxXjh0o+tgjQY9sCP5b3bw==}
'@bbob/core@4.3.1':
resolution: {integrity: sha512-qNS5wNY2oJROV5CQ2e29e9dBz4ZuSO7JcciBXM2yDHvKFUYl+J4o8DxOsugce6z2cFpGz6F4J7vJN7X+6ujWiQ==}
'@bbob/html@4.2.0':
resolution: {integrity: sha512-mZG7MmE/YluH1/FNCr2Jv/Vz3Mq5stZ5tFAjBmYpVVN6Ndus4+FA84vKoHFdUHDiuU1p/e2/o/VUrwsWwLdoIA==}
'@bbob/html@4.3.1':
resolution: {integrity: sha512-W1qFvBZwhpGkZBNfeRpUFsoF492BlfNmgdh5iczg7B/PDULdOPH5lPLtT/6ZNpyx/xo6/DBssl9YtEO/bm15hw==}
'@bbob/parser@4.2.0':
resolution: {integrity: sha512-l8BppXjdQClrUiv+qIN0Oe6aS/vlH7CEduMreDaxYDadUPC0RMzxj9lXVjO0xTbFEVEIUJCGc53qnpiApLbx2g==}
'@bbob/parser@4.3.1':
resolution: {integrity: sha512-BqDo8PDLcVLhFvOMdLmeaWk5qqD8E1bEdvzSJQuJC/U1XFs1tMC4lwZ4oPBFmZCeCLNsYFawqjP/S5MDdr7/Tg==}
'@bbob/plugin-helper@4.2.0':
resolution: {integrity: sha512-Uxs/UJROnkpcq5EJfz/8NCEYAcme8l6oAgMeWLX1nxWeieUhRgpY8BWQ9eQwUOXEKa0tsKVPnlmbUAjFhppVPw==}
'@bbob/plugin-helper@4.3.1':
resolution: {integrity: sha512-0gyhW5sU270iCBvaRO1jYDTs1oGHu913yB9tqxPO9zT5OIDhu47PwensdJ7EuZwgYKEyQ4zZZ+1jvDzkubjdyQ==}
'@bbob/preset-html5@4.2.0':
resolution: {integrity: sha512-X2EIeb2vqTz/n34KWQXEL5IC0SuB6i2/ltRpEaMTyK7IoDEs0XGIWcqVpenb7Z2d4eNA3gTWhkoUUkKlZmfQRQ==}
'@bbob/preset-html5@4.3.1':
resolution: {integrity: sha512-6Yn8kOrBWt/2u4ZUt7nSTzWP+xvTaH4TlAds6p+BcBRbs4Ov2f1zkRgCh1JlckMXwhH9q9CGF0wn6w8bkUYcFA==}
'@bbob/preset@4.2.0':
resolution: {integrity: sha512-IA+kxlrRcYBXE634B8W6uU2DO7VvrxeOqWUzIDKV2CgzTMpmCG875ihGp+Q3T+QxGwzG5S0L4GdmCIULTbzC4A==}
'@bbob/preset@4.3.1':
resolution: {integrity: sha512-we6ITgrwciNIdpZRRJl4y3OOEbXEEVA21895JUInvYXevZBrIgIAvO502qlEYQtqhJqQ1HxY5xyhDjZ9rEYQHg==}
'@bbob/types@4.2.0':
resolution: {integrity: sha512-bSCZnNg0VrPosBBUVkjBDYVKNEqwT0jTNuzvAuNrZkuILgUKtLYI9GHuT8rY4lZecCb7UqGDsHsYt0YJO36eJg==}
'@bbob/types@4.3.1':
resolution: {integrity: sha512-TXxFPfKvZVH/sR0mfn5I99bEFmbnAzIoqFBxG1htRiKyJUx7Yb/ZNS/OsQD1mIsR6+srDqXFDaWbDgVudTTjvQ==}
'@bcoe/v8-coverage@0.2.3':
resolution: {integrity: sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==}
@@ -6857,39 +6840,39 @@ snapshots:
'@babel/helper-string-parser': 7.27.1
'@babel/helper-validator-identifier': 7.27.1
'@bbob/core@4.2.0(patch_hash=2145e7e74e896ed9a0245a5c0efc45359739aa9cf8f4f797557d74124c49dfe4)':
'@bbob/core@4.3.1':
dependencies:
'@bbob/parser': 4.2.0(patch_hash=58c1d33094ba97e82bb2d6f3aebe02293280282dc236ba5c0b4addffb079a5a6)
'@bbob/plugin-helper': 4.2.0(patch_hash=d40357c9c2cb427a75a812d7bc567abd246bd57a77fe38b15847556a626a5bca)
'@bbob/types': 4.2.0
'@bbob/parser': 4.3.1
'@bbob/plugin-helper': 4.3.1
'@bbob/types': 4.3.1
'@bbob/html@4.2.0':
'@bbob/html@4.3.1':
dependencies:
'@bbob/core': 4.2.0(patch_hash=2145e7e74e896ed9a0245a5c0efc45359739aa9cf8f4f797557d74124c49dfe4)
'@bbob/plugin-helper': 4.2.0(patch_hash=d40357c9c2cb427a75a812d7bc567abd246bd57a77fe38b15847556a626a5bca)
'@bbob/types': 4.2.0
'@bbob/core': 4.3.1
'@bbob/plugin-helper': 4.3.1
'@bbob/types': 4.3.1
'@bbob/parser@4.2.0(patch_hash=58c1d33094ba97e82bb2d6f3aebe02293280282dc236ba5c0b4addffb079a5a6)':
'@bbob/parser@4.3.1':
dependencies:
'@bbob/plugin-helper': 4.2.0(patch_hash=d40357c9c2cb427a75a812d7bc567abd246bd57a77fe38b15847556a626a5bca)
'@bbob/types': 4.2.0
'@bbob/plugin-helper': 4.3.1
'@bbob/types': 4.3.1
'@bbob/plugin-helper@4.2.0(patch_hash=d40357c9c2cb427a75a812d7bc567abd246bd57a77fe38b15847556a626a5bca)':
'@bbob/plugin-helper@4.3.1':
dependencies:
'@bbob/types': 4.2.0
'@bbob/types': 4.3.1
'@bbob/preset-html5@4.2.0(patch_hash=2dfb8d9be036009fcc315551cb39b08f478c9a279511267cf570a3486073d39b)':
'@bbob/preset-html5@4.3.1':
dependencies:
'@bbob/plugin-helper': 4.2.0(patch_hash=d40357c9c2cb427a75a812d7bc567abd246bd57a77fe38b15847556a626a5bca)
'@bbob/preset': 4.2.0(patch_hash=6d367f09bfaa669d1936b0d0da34a962fdd4fdf2cacc103a856dc5ba310abfed)
'@bbob/types': 4.2.0
'@bbob/plugin-helper': 4.3.1
'@bbob/preset': 4.3.1
'@bbob/types': 4.3.1
'@bbob/preset@4.2.0(patch_hash=6d367f09bfaa669d1936b0d0da34a962fdd4fdf2cacc103a856dc5ba310abfed)':
'@bbob/preset@4.3.1':
dependencies:
'@bbob/plugin-helper': 4.2.0(patch_hash=d40357c9c2cb427a75a812d7bc567abd246bd57a77fe38b15847556a626a5bca)
'@bbob/types': 4.2.0
'@bbob/plugin-helper': 4.3.1
'@bbob/types': 4.3.1
'@bbob/types@4.2.0': {}
'@bbob/types@4.3.1': {}
'@bcoe/v8-coverage@0.2.3': {}