mirror of
https://github.com/ZSCGR/CloudFlare-ImgBed.git
synced 2026-08-13 04:03:42 +08:00
refactor: move wrangler.worker.toml into worker/ directory
- Rename to worker/wrangler.toml - Update all paths (main, assets directory) to be relative to worker/ - Update package.json, workflow, generate-toml.js, .dockerignore - Fix .gitignore to only ignore root wrangler.toml
This commit is contained in:
@@ -8,5 +8,4 @@ Dockerfile
|
||||
data
|
||||
readme
|
||||
worker
|
||||
wrangler.worker.toml
|
||||
*.md
|
||||
@@ -64,7 +64,7 @@ jobs:
|
||||
if: steps.check.outputs.skip != 'true'
|
||||
run: node worker/generate-routes.js
|
||||
|
||||
- name: Generate wrangler.worker.toml
|
||||
- name: Generate wrangler config
|
||||
if: steps.check.outputs.skip != 'true'
|
||||
env:
|
||||
WORKER_NAME: ${{ inputs.worker_name || secrets.WORKER_NAME }}
|
||||
@@ -80,4 +80,4 @@ jobs:
|
||||
with:
|
||||
apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
|
||||
accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
|
||||
command: deploy --config wrangler.worker.toml
|
||||
command: deploy --config worker/wrangler.toml
|
||||
|
||||
+1
-1
@@ -1,7 +1,7 @@
|
||||
.wrangler/*
|
||||
data/*
|
||||
node_modules
|
||||
wrangler.toml
|
||||
/wrangler.toml
|
||||
.DS_Store
|
||||
|
||||
*.sqlite
|
||||
|
||||
+1
-1
@@ -8,7 +8,7 @@
|
||||
"test": "mocha",
|
||||
"start": "npx wrangler pages dev ./frontend-dist --kv \"img_url\" --r2 \"img_r2\" --ip 0.0.0.0 --port 8080 --persist-to ./data",
|
||||
"start:docker": "node --import ./server/register.mjs server/index.js",
|
||||
"deploy:worker": "node worker/generate-routes.js && npx wrangler deploy --config wrangler.worker.toml"
|
||||
"deploy:worker": "node worker/generate-routes.js && npx wrangler deploy --config worker/wrangler.toml"
|
||||
},
|
||||
"dependencies": {
|
||||
"@aws-sdk/client-s3": "3.726.1",
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
/**
|
||||
* 根据环境变量生成 wrangler.worker.toml
|
||||
* 根据环境变量生成 worker/wrangler.toml
|
||||
* 用于 GitHub Actions 部署,从 Secrets/Variables 读取配置
|
||||
*
|
||||
* 环境变量:
|
||||
@@ -15,18 +15,17 @@ import { join, dirname } from 'path';
|
||||
import { fileURLToPath } from 'url';
|
||||
|
||||
const __dirname = dirname(fileURLToPath(import.meta.url));
|
||||
const ROOT = join(__dirname, '..');
|
||||
const outputPath = join(ROOT, 'wrangler.worker.toml');
|
||||
const outputPath = join(__dirname, 'wrangler.toml');
|
||||
|
||||
const env = process.env;
|
||||
const name = env.WORKER_NAME || 'cloudflare-imgbed';
|
||||
|
||||
let toml = `name = "${name}"
|
||||
main = "worker/index.js"
|
||||
main = "index.js"
|
||||
compatibility_date = "2024-08-21"
|
||||
|
||||
[assets]
|
||||
directory = "./frontend-dist"
|
||||
directory = "../frontend-dist"
|
||||
binding = "ASSETS"
|
||||
not_found_handling = "single-page-application"
|
||||
`;
|
||||
@@ -85,5 +84,5 @@ const safeToml = toml
|
||||
.replace(/(KEY.*= )".*"/gi, '$1"***"')
|
||||
.replace(/(SECRET.*= )".*"/gi, '$1"***"');
|
||||
|
||||
console.log('Generated wrangler.worker.toml:');
|
||||
console.log('Generated worker/wrangler.toml:');
|
||||
console.log(safeToml);
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
# Cloudflare Workers 部署配置
|
||||
# 使用方式: npx wrangler deploy --config wrangler.worker.toml
|
||||
# 使用方式: npx wrangler deploy --config worker/wrangler.toml
|
||||
#
|
||||
# 部署前需要配置以下 binding:
|
||||
# 1. D1 数据库 - 取消注释并填入你的 database_id
|
||||
@@ -11,12 +11,12 @@
|
||||
# 无需手动编辑。详见 .github/workflows/deploy-worker.yml
|
||||
|
||||
name = "cloudflare-imgbed"
|
||||
main = "worker/index.js"
|
||||
main = "index.js"
|
||||
compatibility_date = "2024-08-21"
|
||||
|
||||
# 静态资源(前端文件)
|
||||
[assets]
|
||||
directory = "./frontend-dist"
|
||||
directory = "../frontend-dist"
|
||||
binding = "ASSETS"
|
||||
not_found_handling = "single-page-application"
|
||||
|
||||
Reference in New Issue
Block a user