packages dir

wydengyre · Jan 30, 2024 · 372673e · 372673e
1 parent d948772
commit 372673e
Show file tree

Hide file tree

Showing 39 changed files with 60 additions and 18 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,5 @@
 .idea
 *.iml
 node_modules
-cf/.wrangler
-cf/dist
+packages/cf/.wrangler
+packages/cf/dist
diff --git a/biome.json b/biome.json
@@ -10,7 +10,7 @@
 		}
 	},
 	"files": {
-		"include": ["*.json", "rai/**/*.ts", "rai/**/*.json", "server/**/*.ts", "server/**/*.json", "cf/**/*.ts", "cf/**/*.json"],
-		"ignore": ["cf/.wrangler"]
+		"include": ["*.json", "packages/**/*.ts", "packages/**/*.json"],
+		"ignore": ["packages/cf/.wrangler"]
 	}
 }
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -3,10 +3,10 @@
   "version": "0.0.0",
   "description": "",
 	"private": true,
-	"workspaces": ["./rai", "./server", "./cf"],
+	"workspaces": ["packages/*"],
   "scripts": {
-    "ci-lint": "biome ci rai server cf",
-    "lint": "biome check --apply rai server cf"
+    "ci-lint": "biome ci rai server packages/cf",
+    "lint": "biome check --apply rai server packages/cf"
   },
   "author": "",
   "license": "ISC",

diff --git a/cf/declarations.d.ts → packages/cf/declarations.d.ts b/cf/declarations.d.ts → packages/cf/declarations.d.ts
diff --git a/cf/package.json → packages/cf/package.json b/cf/package.json → packages/cf/package.json
@@ -7,8 +7,8 @@
 		"deploy": "wrangler --env prod deploy",
 		"deploy-preview": "wrangler deploy --dry-run --outdir dist",
 
-		"test": "tsx --tsconfig ./tsconfig.json --test '**/*.test.ts'",
-		"test-only": "tsx --tsconfig ./tsconfig.json --test --test-only '**/*.test.ts'",
+		"test": "tsx --tsconfig tsconfig.json --test '**/*.test.ts'",
+		"test-only": "tsx --tsconfig tsconfig.json --test --test-only '**/*.test.ts'",
 
 		"typecheck": "npm run typecheck-prod && npm run typecheck-test",
 		"typecheck-prod": "tsc",

diff --git a/cf/test/lastoriaingiallo.json → packages/cf/test/lastoriaingiallo.json b/cf/test/lastoriaingiallo.json → packages/cf/test/lastoriaingiallo.json
diff --git a/cf/test/lastoriaingiallo.parsed.json → ...ages/cf/test/lastoriaingiallo.parsed.json b/cf/test/lastoriaingiallo.parsed.json → ...ages/cf/test/lastoriaingiallo.parsed.json
diff --git a/cf/test/lastoriaingiallo.xml → packages/cf/test/lastoriaingiallo.xml b/cf/test/lastoriaingiallo.xml → packages/cf/test/lastoriaingiallo.xml
diff --git a/cf/tsconfig.json → packages/cf/tsconfig.json b/cf/tsconfig.json → packages/cf/tsconfig.json
@@ -5,5 +5,7 @@
 		"types": ["@cloudflare/workers-types"]
   },
 	"include": ["*.ts"],
-	"exclude": ["*.test.ts", "declarations.d.ts"]
+	"exclude": ["*.test.ts",
+		"declarations.d.ts"
+	]
 }
diff --git a/server/tsconfig.test.json → packages/cf/tsconfig.test.json b/server/tsconfig.test.json → packages/cf/tsconfig.test.json
@@ -4,6 +4,8 @@
 	"compilerOptions": {
 		"types": ["node"]
 	},
-	"include": ["*.test.ts", "declarations.d.ts"],
+	"include": ["*.test.ts",
+		"declarations.d.ts"
+	],
 	"exclude": []
 }
diff --git a/cf/worker.test.ts → packages/cf/worker.test.ts b/cf/worker.test.ts → packages/cf/worker.test.ts
diff --git a/cf/worker.ts → packages/cf/worker.ts b/cf/worker.ts → packages/cf/worker.ts
diff --git a/cf/wrangler.toml → packages/cf/wrangler.toml b/cf/wrangler.toml → packages/cf/wrangler.toml
diff --git a/rai/declarations.d.ts → packages/rai/declarations.d.ts b/rai/declarations.d.ts → packages/rai/declarations.d.ts
diff --git a/rai/feed.test.ts → packages/rai/feed.test.ts b/rai/feed.test.ts → packages/rai/feed.test.ts
diff --git a/rai/feed.ts → packages/rai/feed.ts b/rai/feed.ts → packages/rai/feed.ts
@@ -1,6 +1,6 @@
 import { PromisePool } from "@supercharge/promise-pool";
 import { z } from "zod";
-import { FetchWithErr } from "./fetch.js";
+import { FetchWithErr } from "./fetch";
 import * as media from "./media.js";
 
 export { RssConvertConf, feedToRss };

diff --git a/rai/fetch.ts → packages/rai/fetch.ts b/rai/fetch.ts → packages/rai/fetch.ts
diff --git a/rai/genres.test.ts → packages/rai/genres.test.ts b/rai/genres.test.ts → packages/rai/genres.test.ts
diff --git a/rai/genres.ts → packages/rai/genres.ts b/rai/genres.ts → packages/rai/genres.ts
diff --git a/rai/media.test.ts → packages/rai/media.test.ts b/rai/media.test.ts → packages/rai/media.test.ts
diff --git a/rai/media.ts → packages/rai/media.ts b/rai/media.ts → packages/rai/media.ts
diff --git a/rai/package.json → packages/rai/package.json b/rai/package.json → packages/rai/package.json
diff --git a/rai/test/generi.json → packages/rai/test/generi.json b/rai/test/generi.json → packages/rai/test/generi.json
diff --git a/rai/test/lastoriaingiallo.json → packages/rai/test/lastoriaingiallo.json b/rai/test/lastoriaingiallo.json → packages/rai/test/lastoriaingiallo.json
diff --git a/rai/test/lastoriaingiallo.parsed.json → ...ges/rai/test/lastoriaingiallo.parsed.json b/rai/test/lastoriaingiallo.parsed.json → ...ges/rai/test/lastoriaingiallo.parsed.json
diff --git a/rai/test/parse-feed.ts → packages/rai/test/parse-feed.ts b/rai/test/parse-feed.ts → packages/rai/test/parse-feed.ts
diff --git a/rai/tsconfig.json → packages/rai/tsconfig.json b/rai/tsconfig.json → packages/rai/tsconfig.json
diff --git a/cf/tsconfig.test.json → packages/rai/tsconfig.test.json b/cf/tsconfig.test.json → packages/rai/tsconfig.test.json
diff --git a/server/declarations.d.ts → packages/server/declarations.d.ts b/server/declarations.d.ts → packages/server/declarations.d.ts
diff --git a/server/feed-handler.test.ts → packages/server/feed-handler.test.ts b/server/feed-handler.test.ts → packages/server/feed-handler.test.ts
diff --git a/server/feed-handler.ts → packages/server/feed-handler.ts b/server/feed-handler.ts → packages/server/feed-handler.ts
diff --git a/server/handler.test.ts → packages/server/handler.test.ts b/server/handler.test.ts → packages/server/handler.test.ts
diff --git a/server/handler.ts → packages/server/handler.ts b/server/handler.ts → packages/server/handler.ts
diff --git a/server/logger.ts → packages/server/logger.ts b/server/logger.ts → packages/server/logger.ts
diff --git a/server/package.json → packages/server/package.json b/server/package.json → packages/server/package.json
diff --git a/server/test/headers.ts → packages/server/test/headers.ts b/server/test/headers.ts → packages/server/test/headers.ts
diff --git a/server/tsconfig.json → packages/server/tsconfig.json b/server/tsconfig.json → packages/server/tsconfig.json
diff --git a/rai/tsconfig.test.json → packages/server/tsconfig.test.json b/rai/tsconfig.test.json → packages/server/tsconfig.test.json