Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: 💩 Move to ESM as much as I can #14619

Merged
merged 10 commits into from
Mar 1, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 0 additions & 10 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,6 @@ updates:
- dependency-name: jsrsasign
versions: ['>=11.0.0'] # no longer includes KJUR.crypto.Cipher for RSA
# ESM only packages
- dependency-name: fanfou-sdk
versions: ['>=5.0.0']
- dependency-name: got
versions: ['>=12.0.0']
- dependency-name: ip-regex
versions: ['>=5.0.0']
- dependency-name: query-string
versions: ['>=8.0.0']
- dependency-name: rand-user-agent
versions: ['>=2.0.1']
- dependency-name: remark-parse
versions: ['>=10.0.0']
- dependency-name: remark-preset-prettier
Expand Down
2 changes: 1 addition & 1 deletion lib/routes-deprecated/fanfou/utils.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const logger = require('@/utils/logger');
const config = require('@/config').value;
const Fanfou = require('fanfou-sdk');
import Fanfou from 'fanfou-sdk';

const consumerKey = config.fanfou.consumer_key;
const consumerSecret = config.fanfou.consumer_secret;
Expand Down
3 changes: 1 addition & 2 deletions lib/routes.test.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { describe, expect, it, afterAll, jest } from '@jest/globals';
import { describe, expect, it, afterAll } from '@jest/globals';
process.env.SOCKET = 'socket';

jest.mock('request-promise-native');
import app from '@/app';
import Parser from 'rss-parser';
const parser = new Parser();
Expand Down
2 changes: 1 addition & 1 deletion lib/routes/bitbucket/commits.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import got from '@/utils/got';
import { config } from '@/config';
const queryString = require('query-string');
import queryString from 'query-string';
import { parseDate } from '@/utils/parse-date';

module.exports = async (ctx) => {
Expand Down
2 changes: 1 addition & 1 deletion lib/routes/bitbucket/tags.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import got from '@/utils/got';
import { config } from '@/config';
const queryString = require('query-string');
import queryString from 'query-string';
import { parseDate } from '@/utils/parse-date';

module.exports = async (ctx) => {
Expand Down
2 changes: 1 addition & 1 deletion lib/routes/booru/mmda.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import got from '@/utils/got';
const queryString = require('query-string');
import queryString from 'query-string';
import { load } from 'cheerio';

module.exports = async (ctx) => {
Expand Down
2 changes: 1 addition & 1 deletion lib/routes/github/file.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import got from '@/utils/got';
import { config } from '@/config';
const queryString = require('query-string');
import queryString from 'query-string';

module.exports = async (ctx) => {
const user = ctx.req.param('user');
Expand Down
2 changes: 1 addition & 1 deletion lib/routes/github/issue.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ const md = require('markdown-it')({
html: true,
linkify: true,
});
const queryString = require('query-string');
import queryString from 'query-string';
import { parseDate } from '@/utils/parse-date';

module.exports = async (ctx) => {
Expand Down
2 changes: 1 addition & 1 deletion lib/routes/github/repos.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import got from '@/utils/got';
import { config } from '@/config';
const queryString = require('query-string');
import queryString from 'query-string';

module.exports = async (ctx) => {
const user = ctx.req.param('user');
Expand Down
2 changes: 1 addition & 1 deletion lib/routes/mckinsey/cn/index.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// use stock `got` package as a workaround for
// https://github.com/DIYgod/RSSHub/issues/8239
// https://github.com/DIYgod/RSSHub/pull/8288
const got = require('got');
import got from 'got';
import { parseDate } from '@/utils/parse-date';
const { categories } = require('./category-map');

Expand Down
2 changes: 1 addition & 1 deletion lib/routes/pixiv/api/get-bookmarks.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const got = require('../pixiv-got');
const maskHeader = require('../constants').maskHeader;
const queryString = require('query-string');
import queryString from 'query-string';

/**
* 获取用户的收藏
Expand Down
2 changes: 1 addition & 1 deletion lib/routes/pixiv/api/get-illust-follows.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const got = require('../pixiv-got');
const maskHeader = require('../constants').maskHeader;
const queryString = require('query-string');
import queryString from 'query-string';

/**
* 获取用户关注的画师们的最新插画
Expand Down
2 changes: 1 addition & 1 deletion lib/routes/pixiv/api/get-illusts.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const got = require('../pixiv-got');
const maskHeader = require('../constants').maskHeader;
const queryString = require('query-string');
import queryString from 'query-string';

/**
* 获取用户插画作品
Expand Down
2 changes: 1 addition & 1 deletion lib/routes/pixiv/api/get-ranking.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
const got = require('../pixiv-got');
const maskHeader = require('../constants').maskHeader;
const assert = require('assert');
const queryString = require('query-string');
import queryString from 'query-string';

const allowMode = new Set(['day', 'week', 'month', 'day_male', 'day_female', 'day_ai', 'week_original', 'week_rookie', 'day_r18', 'day_r18_ai', 'day_male_r18', 'day_female_r18', 'week_r18', 'week_r18g']);

Expand Down
2 changes: 1 addition & 1 deletion lib/routes/pixiv/api/get-user-detail.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const got = require('../pixiv-got');
const maskHeader = require('../constants').maskHeader;
const queryString = require('query-string');
import queryString from 'query-string';

/**
* pixiv 用户
Expand Down
2 changes: 1 addition & 1 deletion lib/routes/pixiv/api/search-illust.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const got = require('../pixiv-got');
const maskHeader = require('../constants').maskHeader;
const queryString = require('query-string');
import queryString from 'query-string';

/**
* 按时间排序搜索内容
Expand Down
2 changes: 1 addition & 1 deletion lib/routes/pixiv/api/search-popular-illust.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const got = require('../pixiv-got');
const maskHeader = require('../constants').maskHeader;
const queryString = require('query-string');
import queryString from 'query-string';

/**
* 按热门排序搜索内容
Expand Down
2 changes: 1 addition & 1 deletion lib/routes/pixiv/pixiv-got.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
const tls = require('tls');
const ipRegex = require('ip-regex');
import ipRegex from 'ip-regex';
import got from '@/utils/got';
import logger from '@/utils/logger';
import { config } from '@/config';
Expand Down
2 changes: 1 addition & 1 deletion lib/routes/saraba1st/thread.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import got from '@/utils/got';
import { load } from 'cheerio';
const queryString = require('query-string');
import queryString from 'query-string';
import { config } from '@/config';
import { parseDate } from '@/utils/parse-date';
import timezone from '@/utils/timezone';
Expand Down
2 changes: 1 addition & 1 deletion lib/routes/twitter/web-api/twitter-api.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import logger from '@/utils/logger';
import got from '@/utils/got';
const OAuth = require('oauth-1.0a');
const CryptoJS = require('crypto-js');
const queryString = require('query-string');
import queryString from 'query-string';
const { getToken } = require('./token');
import cache from '@/utils/cache';

Expand Down
2 changes: 1 addition & 1 deletion lib/routes/weibo/super-index.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import cache from '@/utils/cache';
import got from '@/utils/got';
const weiboUtils = require('./utils');
const queryString = require('query-string');
import queryString from 'query-string';
import { config } from '@/config';

module.exports = async (ctx) => {
Expand Down
2 changes: 1 addition & 1 deletion lib/routes/xueqiu/favorite.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import got from '@/utils/got';
const queryString = require('query-string');
import queryString from 'query-string';
import { parseDate } from '@/utils/parse-date';

module.exports = async (ctx) => {
Expand Down
2 changes: 1 addition & 1 deletion lib/routes/xueqiu/hots.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import got from '@/utils/got';
const queryString = require('query-string');
import queryString from 'query-string';
import { parseDate } from '@/utils/parse-date';
const sanitizeHtml = require('sanitize-html');

Expand Down
2 changes: 1 addition & 1 deletion lib/routes/xueqiu/stock-info.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import got from '@/utils/got';
import { load } from 'cheerio';
const queryString = require('query-string');
import queryString from 'query-string';
import { parseDate } from '@/utils/parse-date';
const sanitizeHtml = require('sanitize-html');

Expand Down
2 changes: 1 addition & 1 deletion lib/routes/xueqiu/user-stock.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import got from '@/utils/got';
const queryString = require('query-string');
import queryString from 'query-string';
import { parseDate } from '@/utils/parse-date';

module.exports = async (ctx) => {
Expand Down
2 changes: 1 addition & 1 deletion lib/routes/xueqiu/user.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import cache from '@/utils/cache';
import got from '@/utils/got';
const queryString = require('query-string');
import queryString from 'query-string';
import { parseDate } from '@/utils/parse-date';
const sanitizeHtml = require('sanitize-html');

Expand Down
4 changes: 3 additions & 1 deletion lib/utils/got.ts
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,9 @@ const custom: typeof got & {
headers: {
'user-agent': config.ua,
},
timeout: config.requestTimeout,
timeout: {
request: config.requestTimeout,
},
});
custom.all = (list) => Promise.all(list);

Expand Down
13 changes: 6 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@
"@koa/router": "12.0.1",
"@notionhq/client": "2.2.14",
"@postlight/parser": "2.2.3",
"@sentry/node": "7.103.0",
"@sentry/node": "7.104.0",
"@tonyrl/rand-user-agent": "2.0.52",
"@types/node": "20.11.24",
"aes-js": "3.1.2",
Expand All @@ -92,15 +92,15 @@
"city-timezones": "1.2.1",
"crypto-js": "4.2.0",
"currency-symbol-map": "5.1.0",
"dayjs": "1.11.8",
"dayjs": "1.11.10",
DIYgod marked this conversation as resolved.
Show resolved Hide resolved
"directory-import": "3.2.1",
"dotenv": "16.4.5",
"entities": "4.5.0",
"etag": "1.8.1",
"fanfou-sdk": "4.2.0",
"fanfou-sdk": "5.0.0",
"git-rev-sync": "3.0.2",
"googleapis": "133.0.0",
"got": "11.8.6",
"got": "14.2.0",
"hono": "4.0.8",
"html-to-text": "9.0.5",
"https-proxy-agent": "7.0.4",
Expand All @@ -109,7 +109,7 @@
"instagram-private-api": "1.45.3",
"ioredis": "5.3.2",
"ip": "2.0.1",
"ip-regex": "4.3.0",
"ip-regex": "5.0.0",
"jsdom": "24.0.0",
"json-bigint": "1.0.0",
"json5": "2.2.3",
Expand All @@ -135,7 +135,7 @@
"puppeteer-extra-plugin-stealth": "2.11.2",
"puppeteer-extra-plugin-user-data-dir": "2.4.1",
"puppeteer-extra-plugin-user-preferences": "2.4.1",
"query-string": "7.1.3",
"query-string": "9.0.0",
"re2js": "0.4.1",
"require-all": "3.0.0",
"rfc4648": "1.5.3",
Expand Down Expand Up @@ -216,7 +216,6 @@
"remark-pangu": "2.2.0",
"remark-parse": "9.0.0",
"remark-preset-prettier": "0.5.1",
"request-promise-native": "1.0.9",
"staged-git-files": "1.3.0",
"string-width": "7.1.0",
"supertest": "6.3.4",
Expand Down
Loading
Loading