Switch root project to pnpm

temporalio · Dec 3, 2024 · 1a8cf08 · 1a8cf08
1 parent 42b2d85
commit 1a8cf08
Show file tree

Hide file tree

Showing 18 changed files with 94 additions and 19 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -34,8 +34,8 @@ jobs:
           node-version: ${{ matrix.node }}
           # Comment out cache line when testing with act:
           # (Test command is: act --platform ubuntu-latest=lucasalt/act_base:latest)
-          cache: 'npm'
-      - run: yarn
+          cache: 'pnpm'
+      - run: pnpm install
         working-directory: ${{ matrix.project }}
       - run: npm run build
         working-directory: ${{ matrix.project }}
@@ -96,8 +96,8 @@ jobs:
           node-version: 20
           # Comment out cache line when testing with act:
           # (Test command is: act --platform ubuntu-latest=lucasalt/act_base:latest)
-          cache: 'npm'
-      - run: yarn
+          cache: 'pnpm'
+      - run: pnpm install
         working-directory: ${{ matrix.project }}
       - run: npm run build
         working-directory: ${{ matrix.project }}

diff --git a/empty/src/workflows.ts b/empty/src/workflows.ts
@@ -1 +1,5 @@
 // Add Workflow Definitions here.
+export async function YOUR_WORKFLOW(name: string): Promise<string> {
+  // Your workflow code here
+  return `Hello, ${name}!`;
+}
diff --git a/encryption/package.json b/encryption/package.json
@@ -24,6 +24,7 @@
     "@temporalio/activity": "^1.11.5",
     "@temporalio/client": "^1.11.5",
     "@temporalio/common": "^1.11.5",
+    "@temporalio/proto": "^1.11.5",
     "@temporalio/worker": "^1.11.5",
     "@temporalio/workflow": "^1.11.5",
     "cors": "^2.8.5",

diff --git a/food-delivery/apps/driver/next-env.d.ts b/food-delivery/apps/driver/next-env.d.ts
@@ -2,4 +2,4 @@
 /// <reference types="next/image-types/global" />
 
 // NOTE: This file should not be edited
-// see https://nextjs.org/docs/basic-features/typescript for more information.
+// see https://nextjs.org/docs/pages/building-your-application/configuring/typescript for more information.
diff --git a/food-delivery/apps/driver/package.json b/food-delivery/apps/driver/package.json
@@ -12,8 +12,10 @@
   },
   "dependencies": {
     "@tanstack/react-query": "^4.16.1",
+    "@temporalio/client": "^1.11.5",
     "@trpc/client": "^10.0.0-rc.8",
     "@trpc/next": "^10.0.0-rc.8",
+    "@trpc/react-query": "^10.0.0-rc.8",
     "@trpc/server": "^10.0.0-rc.8",
     "common": "*",
     "menu": "*",

diff --git a/food-delivery/apps/menu/next-env.d.ts b/food-delivery/apps/menu/next-env.d.ts
@@ -2,4 +2,4 @@
 /// <reference types="next/image-types/global" />
 
 // NOTE: This file should not be edited
-// see https://nextjs.org/docs/basic-features/typescript for more information.
+// see https://nextjs.org/docs/pages/building-your-application/configuring/typescript for more information.
diff --git a/food-delivery/apps/menu/package.json b/food-delivery/apps/menu/package.json
@@ -11,7 +11,9 @@
     "postinstall": "npm run tailwind"
   },
   "dependencies": {
+    "@heroicons/react": "^2.0.13",
     "@tanstack/react-query": "^4.16.1",
+    "@temporalio/client": "^1.11.5",
     "@trpc/client": "^10.0.0-rc.8",
     "@trpc/next": "^10.0.0-rc.8",
     "@trpc/react-query": "^10.0.0-rc.8",

diff --git a/food-delivery/apps/worker/tsconfig.json b/food-delivery/apps/worker/tsconfig.json
@@ -2,9 +2,19 @@
   "extends": "tsconfig/base.json",
   "version": "5.6.3",
   "compilerOptions": {
+    "composite": true,
     "sourceMap": true,
     "rootDir": "./src",
-    "outDir": "./lib"
+    "outDir": "./lib",
+    "baseUrl": ".",
+    "paths": {
+      "activities": ["../../packages/activities/index"]
+    }
   },
-  "include": ["src/**/*.ts"]
+  "include": ["src/**/*.ts"],
+  "references": [
+    {
+      "path": "../../packages/activities"
+    }
+  ]
 }
diff --git a/food-delivery/packages/common/package.json b/food-delivery/packages/common/package.json
@@ -10,7 +10,9 @@
     "lint": "TIMING=1 eslint \"**/*.ts*\""
   },
   "dependencies": {
-    "@temporalio/client": "^1.11.5"
+    "@temporalio/client": "^1.11.5",
+    "@trpc/server": "^10.0.0-rc.8",
+    "@trpc/react-query": "^10.0.0-rc.8"
   },
   "devDependencies": {
     "eslint": "^8.57.1",

diff --git a/food-delivery/packages/tsconfig/base.json b/food-delivery/packages/tsconfig/base.json
@@ -2,13 +2,14 @@
   "$schema": "https://json.schemastore.org/tsconfig",
   "display": "Default",
   "compilerOptions": {
-    "composite": false,
+    "lib": ["ES2015"],
+    "composite": true,
     "declaration": true,
     "declarationMap": true,
     "esModuleInterop": true,
     "forceConsistentCasingInFileNames": true,
     "inlineSources": false,
-    "isolatedModules": true,
+    "isolatedModules": false,
     "moduleResolution": "node",
     "noUnusedLocals": false,
     "noUnusedParameters": false,

diff --git a/food-delivery/packages/ui/package.json b/food-delivery/packages/ui/package.json
@@ -14,6 +14,7 @@
     "eslint": "^8.57.1",
     "eslint-config-custom": "*",
     "react": "^18.3.1",
+    "next": "^15.0.3",
     "tsconfig": "*",
     "typescript": "^5.6.3"
   },

diff --git a/interceptors-opentelemetry/package.json b/interceptors-opentelemetry/package.json
@@ -24,6 +24,7 @@
     "@opentelemetry/resources": "^1.9.0",
     "@opentelemetry/sdk-node": "^0.55.0",
     "@opentelemetry/sdk-trace-base": "^1.9.0",
+    "@opentelemetry/semantic-conventions": "^1.9.0",
     "@temporalio/activity": "^1.11.5",
     "@temporalio/client": "^1.11.5",
     "@temporalio/interceptors-opentelemetry": "^1.11.5",

diff --git a/message-passing/safe-message-handlers/tsconfig.json b/message-passing/safe-message-handlers/tsconfig.json
@@ -0,0 +1,12 @@
+{
+  "extends": "@tsconfig/node18/tsconfig.json",
+  "version": "5.6.3",
+  "compilerOptions": {
+    "declaration": true,
+    "declarationMap": true,
+    "sourceMap": true,
+    "rootDir": "./src",
+    "outDir": "./lib"
+  },
+  "include": ["src/**/*.ts"]
+}
diff --git a/monorepo-folders/package.json b/monorepo-folders/package.json
@@ -21,5 +21,6 @@
     "eslint": "^8.57.1",
     "prettier": "^3.3.3",
     "ts-loader": "^9.2.6"
-  }
+  },
+  "packageManager": "[email protected]"
 }
diff --git a/package.json b/package.json
@@ -2,8 +2,7 @@
   "name": "samples-typescript",
   "private": true,
   "scripts": {
-    "bootstrap": "lerna bootstrap --npm-client=yarn --ignore=monorepo-folders --ignore=nestjs-exchange-rates --ignore=food-delivery",
-    "build": "lerna run build --ignore=monorepo-folders --ignore=nestjs-exchange-rates --ignore=food-delivery",
+    "build": "pnpm run -r build --ignore ",
     "test": "lerna run --stream test",
     "format": "prettier --write .",
     "copy-shared-files": "zx .scripts/copy-shared-files.mjs",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/protobufs/package.json b/protobufs/package.json
@@ -25,6 +25,7 @@
   "dependencies": {
     "@temporalio/activity": "^1.11.5",
     "@temporalio/client": "^1.11.5",
+    "@temporalio/common": "^1.11.5",
     "@temporalio/worker": "^1.11.5",
     "@temporalio/workflow": "^1.11.5",
     "uuid": "^8.3.2"

diff --git a/search-attributes/package.json b/search-attributes/package.json
@@ -23,6 +23,8 @@
   "dependencies": {
     "@temporalio/activity": "^1.11.5",
     "@temporalio/client": "^1.11.5",
+    "@temporalio/common": "^1.11.5",
+    "@temporalio/proto": "^1.11.5",
     "@temporalio/worker": "^1.11.5",
     "@temporalio/workflow": "^1.11.5"
   },