Skip to content

Commit 16a4d42

Browse files
committed
Merge remote-tracking branch 'origin/master' into rejudge_task
2 parents 178c1cd + 8755558 commit 16a4d42

96 files changed

Lines changed: 2077 additions & 1691 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.yarn/releases/yarn-4.7.0.cjs

Lines changed: 0 additions & 935 deletions
This file was deleted.

.yarn/releases/yarn-4.9.1.cjs

Lines changed: 948 additions & 0 deletions
Large diffs are not rendered by default.

.yarnrc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ preferReuse: true
1010

1111
tsEnableAutoTypes: true
1212

13-
yarnPath: .yarn/releases/yarn-4.7.0.cjs
13+
yarnPath: .yarn/releases/yarn-4.9.1.cjs

build/publish.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import { gt, prerelease } from 'semver';
88
import { getWorkspaces, spawnAsync } from './utils';
99

1010
const {
11-
CI, GITHUB_EVENT_NAME, GITHUB_REF,
11+
CI, GITHUB_EVENT_NAME, GITHUB_REF, SKIP_PROVENANCE,
1212
} = process.env;
1313

1414
const tag = GITHUB_REF === 'refs/heads/master' ? 'latest' : GITHUB_REF === 'refs/heads/next' ? 'dev' : undefined;
@@ -73,7 +73,7 @@ if (CI && (!tag || GITHUB_EVENT_NAME !== 'push')) {
7373
}
7474
}
7575
await spawnAsync(
76-
`yarn npm publish --access public --tag ${tag}`,
76+
`yarn npm publish --access public --tag ${tag}${(CI && !SKIP_PROVENANCE) ? ' --provenance' : ''}`,
7777
path.resolve(name),
7878
);
7979
}

eslint.config.mjs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,9 @@ export default defineConfig([globalIgnores([
8686
},
8787

8888
settings: {
89+
'react-x': {
90+
version: '18.3.1',
91+
},
8992
'import/resolver': {
9093
webpack: {
9194
config: {

examples/reverse_proxy/Caddyfile

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,29 @@
1+
# 其他需求清参照 https://caddyserver.com/docs/ 说明进行设置。
2+
# For more information, refer to caddy v2 documentation.
13
hydro.ac {
2-
reverse_proxy http://localhost:8888
4+
encode zstd gzip
5+
log {
6+
output file /data/access.log {
7+
roll_size 1gb
8+
roll_keep_for 72h
9+
}
10+
format json
11+
}
12+
# Handle static files directly, for better performance.
13+
root * /root/.hydro/static
14+
@static {
15+
file {
16+
try_files {path}
17+
}
18+
}
19+
handle @static {
20+
file_server
21+
}
22+
handle {
23+
reverse_proxy http://127.0.0.1:8888
24+
}
25+
}
26+
27+
www.hydro.ac {
28+
redir * https://hydro.ac{uri}
329
}

examples/reverse_proxy/nginx.conf

Lines changed: 48 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,32 @@
11
server {
2-
listen 8080;
3-
server_name localhost;
4-
root /tmp/hydro/public;
2+
listen 443 ssl http2;
3+
listen [::]:443 ssl http2;
4+
server_name hydro.ac;
5+
root /root/.hydro/static;
6+
access_log /data/access.log combined buffer=512k flush=1m;
7+
error_log /data/error.log warn;
8+
9+
gzip on;
10+
gzip_vary on;
11+
gzip_proxied any;
12+
gzip_comp_level 6;
13+
gzip_types text/plain text/css text/xml application/json application/javascript application/rss+xml application/atom+xml image/svg+xml;
14+
15+
# If you have brotli module installed
16+
# brotli on;
17+
# brotli_comp_level 6;
18+
# brotli_types text/plain text/css text/xml application/json application/javascript application/rss+xml application/atom+xml image/svg+xml;
19+
20+
# ssl_certificate /path/to/hydro.ac/fullchain.pem;
21+
# ssl_certificate_key /path/to/hydro.ac/privkey.pem;
22+
# ssl_trusted_certificate /path/to/hydro.ac/chain.pem;
23+
24+
# You may want to enable this if nginx reports '[emerg] unknown "connection_upgrade" variable'
25+
# ref: https://blog.tsinbei.com/en/archives/677/
26+
# map $http_upgrade $connection_upgrade {
27+
# default upgrade;
28+
# '' close;
29+
# }
530

631
location / {
732
try_files $uri @proxy_to_app;
@@ -16,4 +41,23 @@ server {
1641
proxy_set_header X-Forwarded-For $remote_addr;
1742
proxy_set_header X-Forwarded-Proto $scheme;
1843
}
19-
}
44+
}
45+
46+
server {
47+
listen 443 ssl http2;
48+
listen [::]:443 ssl http2;
49+
server_name www.hydro.ac;
50+
51+
# ssl_certificate /path/to/www.hydro.ac/fullchain.pem;
52+
# ssl_certificate_key /path/to/www.hydro.ac/privkey.pem;
53+
# ssl_trusted_certificate /path/to/www.hydro.ac/chain.pem;
54+
return 301 https://hydro.ac$request_uri;
55+
}
56+
57+
server {
58+
listen 80;
59+
listen [::]:80;
60+
server_name .hydro.ac;
61+
62+
return 301 https://hydro.ac$request_uri;
63+
}

framework/eslint-config/package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,21 @@
44
"license": "MIT",
55
"main": "base.mjs",
66
"dependencies": {
7-
"@eslint-react/eslint-plugin": "^1.47.4",
8-
"@eslint/compat": "^1.2.8",
7+
"@eslint-react/eslint-plugin": "^1.49.0",
8+
"@eslint/compat": "^1.2.9",
99
"@eslint/eslintrc": "^3.3.1",
1010
"@stylistic/eslint-plugin": "^4.2.0",
11-
"@typescript-eslint/eslint-plugin": "^8.30.1",
12-
"@typescript-eslint/parser": "^8.30.1",
11+
"@typescript-eslint/eslint-plugin": "^8.32.0",
12+
"@typescript-eslint/parser": "^8.32.0",
1313
"eslint-config-airbnb": "^19.0.4",
1414
"eslint-plugin-de-morgan": "^1.2.1",
1515
"eslint-plugin-github": "^6.0.0",
1616
"eslint-plugin-import": "2.31.0",
1717
"eslint-plugin-jsx-a11y": "^6.10.2",
1818
"eslint-plugin-react-hooks": "^5.2.0",
19-
"eslint-plugin-react-refresh": "^0.4.19",
19+
"eslint-plugin-react-refresh": "^0.4.20",
2020
"eslint-plugin-simple-import-sort": "^12.1.1",
21-
"globals": "^16.0.0"
21+
"globals": "^16.1.0"
2222
},
2323
"peerDependencies": {
2424
"eslint": ">= 9"

0 commit comments

Comments
 (0)