Merge branch 'main' into shortcut-improvements

Author: samejr

.changeset/fuzzy-coins-cross.md

@@ -0,0 +1,5 @@
+---
+"trigger.dev": patch
+---
+
+Fix externals from monorepo packages with scoped package names #1552

.changeset/kind-plants-tap.md

@@ -49,6 +49,14 @@ export class ExpireEnqueuedRunService extends BaseService {
       return;
     }
 
+    if (run.lockedAt) {
+      logger.debug("Run cannot be expired because it's locked", {
+        run,
+      });
+
+      return;
+    }
+
     logger.debug("Expiring enqueued run", {
       run,
     });

.changeset/rude-walls-help.md

@@ -1,6 +1,6 @@
 ---
 title: "Scrape the top 3 articles from Hacker News and email yourself a summary every weekday"
-sidebarTitle: "Scrape Hacker News"
+sidebarTitle: "Browserbase & Puppeteer"
 description: "This example demonstrates how to scrape the top 3 articles from Hacker News using BrowserBase and Puppeteer, summarize them with ChatGPT and send a nicely formatted email summary to yourself every weekday using Resend."
 ---
 

apps/webapp/app/v3/services/expireEnqueuedRun.server.ts

@@ -1,5 +1,12 @@
 # @trigger.dev/build
 
+## 3.3.7
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@trigger.dev/[email protected]`
+
 ## 3.3.6
 
 ### Patch Changes

docs/guides/examples/scrape-hacker-news.mdx

@@ -1,6 +1,6 @@
 {
   "name": "@trigger.dev/build",
-  "version": "3.3.6",
+  "version": "3.3.7",
   "description": "trigger.dev build extensions",
   "license": "MIT",
   "publishConfig": {
@@ -65,7 +65,7 @@
     "check-exports": "attw --pack ."
   },
   "dependencies": {
-    "@trigger.dev/core": "workspace:3.3.6",
+    "@trigger.dev/core": "workspace:3.3.7",
     "pkg-types": "^1.1.3",
     "tinyglobby": "^0.2.2",
     "tsconfck": "3.1.3"

packages/build/CHANGELOG.md

@@ -1,5 +1,13 @@
 # trigger.dev
 
+## 3.3.7
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@trigger.dev/[email protected]`
+  - `@trigger.dev/[email protected]`
+
 ## 3.3.6
 
 ### Patch Changes

packages/build/package.json

@@ -1,6 +1,6 @@
 {
   "name": "trigger.dev",
-  "version": "3.3.6",
+  "version": "3.3.7",
   "description": "A Command-Line Interface for Trigger.dev (v3) projects",
   "type": "module",
   "license": "MIT",
@@ -87,8 +87,8 @@
     "@opentelemetry/sdk-trace-base": "1.25.1",
     "@opentelemetry/sdk-trace-node": "1.25.1",
     "@opentelemetry/semantic-conventions": "1.25.1",
-    "@trigger.dev/build": "workspace:3.3.6",
-    "@trigger.dev/core": "workspace:3.3.6",
+    "@trigger.dev/build": "workspace:3.3.7",
+    "@trigger.dev/core": "workspace:3.3.7",
     "c12": "^1.11.1",
     "chalk": "^5.2.0",
     "cli-table3": "^0.6.3",

packages/cli-v3/CHANGELOG.md

@@ -45,6 +45,27 @@ async function linkExternal(external: CollectedExternal, resolveDir: string, log
     external,
   });
 
+  // For scoped packages, we need to ensure the scope directory exists
+  if (external.name.startsWith("@")) {
+    // Get the scope part (e.g., '@huggingface')
+    const scopeDir = external.name.split("/")[0];
+
+    if (scopeDir) {
+      const scopePath = join(destinationPath, scopeDir);
+
+      logger.debug("[externals] Ensure scope directory exists", {
+        scopeDir,
+        scopePath,
+      });
+
+      await mkdir(scopePath, { recursive: true });
+    } else {
+      logger.debug("[externals] Unable to get the scope directory", {
+        external,
+      });
+    }
+  }
+
   const symbolicLinkPath = join(destinationPath, external.name);
 
   // Make sure the symbolic link does not exist