Merge pull request #44 from daichitakahashi/separateIaC

Separate IaC

.changeset/config.json

@@ -4,7 +4,7 @@
   "commit": false,
   "fixed": [],
   "linked": [],
-  "access": "restricted",
+  "access": "public",
   "baseBranch": "main",
   "updateInternalDependencies": "patch",
   "ignore": ["dev-eventhub", "flaky-handler", "stable-handler"]

.pnpmfile.cjs

@@ -5,6 +5,12 @@ function readPackage(pkg, _) {
       "cf-eventhub": "workspace:../cf-eventhub",
     };
   }
+  if (pkg.name === "@cf-eventhub/pulumi") {
+    pkg.dependencies = {
+      ...pkg.dependencies,
+      "cf-eventhub": "workspace:../../cf-eventhub",
+    };
+  }
 
   return pkg;
 }

cf-eventhub/CHANGELOG.md

@@ -1,5 +1,11 @@
 # cf-eventhub
 
+## 0.0.4
+
+### Patch Changes
+
+- 9a22301: New separated "@cf-eventhub/pulumi" package
+
 ## 0.0.3
 
 ### Patch Changes

cf-eventhub/package.json

@@ -1,7 +1,10 @@
 {
   "name": "cf-eventhub",
   "type": "module",
-  "version": "0.0.3",
+  "version": "0.0.4",
+  "keywords": [
+    "cloudflare"
+  ],
   "scripts": {
     "build": "tsup --external cloudflare:workers",
     "test": "vitest -c vitest.config.worker.mts",
@@ -33,31 +36,37 @@
   "tsup": {
     "entry": [
       "src/**/*.ts",
-      "!src/**/*.test.ts"
+      "!src/**/*.test.ts",
+      "!src/repositorytest/**/*.ts"
     ],
     "splitting": false,
     "sourcemap": true,
     "format": [
-      "esm"
+      "esm",
+      "cjs"
     ],
     "dts": true,
     "clean": true
   },
   "exports": {
     ".": {
       "import": "./dist/index.js",
+      "require": "./dist/index.cjs",
       "types": "./dist/index.d.ts"
     },
     "./core": {
       "import": "./dist/core/index.js",
+      "require": "./dist/core/index.cjs",
       "types": "./dist/core/index.d.ts"
     },
     "./dev": {
       "import": "./dist/dev/index.js",
+      "require": "./dist/dev/index.cjs",
       "types": "./dist/dev/index.d.ts"
     },
     "./postgresjs": {
       "import": "./dist/postgres/postgresjs.js",
+      "require": "./dist/postgres/index.cjs",
       "types": "./dist/postgres/postgresjs.d.ts"
     }
   },

cf-eventhub/src/core/index.ts

@@ -1,5 +1,6 @@
 export * from "./logger";
 export * from "./executor";
 export * from "./hub";
+export * from "./hub/routing";
 export * from "./repository";
 export * from "./type";

iac/pulumi/CHANGELOG.md

@@ -0,0 +1,9 @@
+# @cf-eventhub/pulumi
+
+## 0.0.1
+
+### Patch Changes
+
+- 9a22301: New separated "@cf-eventhub/pulumi" package
+- Updated dependencies [9a22301]
+  - [email protected]

iac/pulumi/package.json

@@ -0,0 +1,42 @@
+{
+  "name": "@cf-eventhub/pulumi",
+  "main": "src/index.ts",
+  "type": "commonjs",
+  "version": "0.0.1",
+  "keywords": [
+    "pulumi",
+    "cloudflare"
+  ],
+  "scripts": {
+    "build": "tsup"
+  },
+  "devDependencies": {
+    "tsup": "^8.3.5",
+    "typescript": "^5.7.2"
+  },
+  "dependencies": {
+    "@pulumi/cloudflare": "^5.40.0",
+    "@pulumi/pulumi": "^3.113.0",
+    "cf-eventhub": "^0.0.4"
+  },
+  "tsup": {
+    "entry": [
+      "src/index.ts"
+    ],
+    "splitting": false,
+    "sourcemap": true,
+    "format": [
+      "esm",
+      "cjs"
+    ],
+    "dts": true,
+    "clean": true
+  },
+  "exports": {
+    "import": "./dist/index.mjs",
+    "require": "./dist/index.js"
+  },
+  "files": [
+    "dist"
+  ]
+}

cf-eventhub/src/iac/pulumi/index.ts → iac/pulumi/src/index.ts

@@ -1,7 +1,6 @@
 import { Queue, WorkersCronTrigger } from "@pulumi/cloudflare";
 import { type Input, jsonStringify } from "@pulumi/pulumi";
-
-import type { Config, ConfigInput } from "../../core/hub/routing";
+import type { Config, ConfigInput } from "cf-eventhub/core";
 
 export type HandlerWorkerScriptBinding = {
   readonly name: Input<string>;
@@ -238,12 +237,12 @@ export abstract class EventHub<
     this.handlers = handlers;
   }
 
-  abstract createEventHubWorkerScript(
+  protected abstract createEventHubWorkerScript(
     name: string,
     args: CreateEventHubWorkerScriptArgs,
   ): _WorkerScript;
 
-  abstract createExecutorWorkerScript(
+  protected abstract createExecutorWorkerScript(
     name: string,
     args: CreateExecutorWorkerScriptArgs,
   ): _WorkerScript;

iac/pulumi/tsconfig.json

@@ -0,0 +1,15 @@
+{
+    "compilerOptions": {
+        "strict": true,
+        "outDir": "bin",
+        "target": "es2020",
+        "module": "NodeNext",
+        "moduleResolution": "nodenext",
+        "sourceMap": true,
+        "experimentalDecorators": true,
+        "pretty": true,
+        "noFallthroughCasesInSwitch": true,
+        "noImplicitReturns": true,
+        "forceConsistentCasingInFileNames": true
+    }
+}

package.json

@@ -1,6 +1,7 @@
 {
   "name": "cf-eventhub",
   "version": "1.0.0",
+  "private": true,
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -16,8 +17,5 @@
   "devDependencies": {
     "@changesets/cli": "^2.27.10",
     "chalk": "^5.3.0"
-  },
-  "publishConfig": {
-    "access": "public"
   }
 }

pnpm-workspace.yaml

@@ -1,4 +1,5 @@
 packages:
   - cf-eventhub
   - web-console
+  - iac/pulumi
   - internal/*