feature: add no-trigger-core-import

.changeset/yellow-roses-arrive.md

@@ -0,0 +1,5 @@
+---
+"@trigger.dev/core": patch
+---
+
+Add more package exports that can be used from the web app

apps/webapp/.eslintrc

@@ -1,13 +1,36 @@
 {
-  "extends": ["@remix-run/eslint-config", "@remix-run/eslint-config/node", "prettier"],
-  "rules": {
-    "@typescript-eslint/strict-boolean-expressions": [
-      "error",
-      {
-        "allowNullableBoolean": true,
-        "allowNullableString": true,
-        "allowNullableNumber": true
+  "plugins": [
+    "@trigger.dev/eslint-plugin",
+    "react-hooks",
+    "@typescript-eslint/eslint-plugin",
+    "import"
+  ],
+  "parser": "@typescript-eslint/parser",
+  "overrides": [
+    {
+      "files": ["*.ts", "*.tsx"],
+      "rules": {
+        // Autofixes imports from "@trigger.dev/core" to fine grained modules
+        "@trigger.dev/no-trigger-core-import": "error",
+        // Normalize `import type {}` and `import { type }`
+        "@typescript-eslint/consistent-type-imports": [
+          "warn",
+          {
+            // the "type" annotation can get tangled and cause syntax errors
+            // during some autofixes, so easier to just turn it off
+            "prefer": "type-imports",
+            "disallowTypeAnnotations": true,
+            "fixStyle": "inline-type-imports"
+          }
+        ],
+        // no-trigger-core-import splits imports into multiple lines
+        // this one merges them back into a single line
+        // if they still import from the same module
+        "import/no-duplicates": ["warn", { "prefer-inline": true }],
+        // lots of undeclared vars, enable this rule if you want to clean them up
+        "turbo/no-undeclared-env-vars": "off"
       }
-    ]
-  }
+    }
+  ],
+  "ignorePatterns": ["seed.js", "seedCloud.ts", "populate.js"]
 }

apps/webapp/app/components/primitives/Alert.tsx

@@ -8,12 +8,8 @@ const Alert = AlertDialogPrimitive.Root;
 
 const AlertTrigger = AlertDialogPrimitive.Trigger;
 
-const AlertPortal = ({
-  className,
-  children,
-  ...props
-}: AlertDialogPrimitive.AlertDialogPortalProps) => (
-  <AlertDialogPrimitive.Portal className={cn(className)} {...props}>
+const AlertPortal = ({ children, ...props }: AlertDialogPrimitive.AlertDialogPortalProps) => (
+  <AlertDialogPrimitive.Portal {...props}>
     <div className="fixed inset-0 z-50 flex items-end justify-center sm:items-center">
       {children}
     </div>

apps/webapp/app/components/primitives/Dialog.tsx

@@ -10,8 +10,8 @@ const Dialog = DialogPrimitive.Root;
 
 const DialogTrigger = DialogPrimitive.Trigger;
 
-const DialogPortal = ({ className, children, ...props }: DialogPrimitive.DialogPortalProps) => (
-  <DialogPrimitive.Portal className={cn(className)} {...props}>
+const DialogPortal = ({ children, ...props }: DialogPrimitive.DialogPortalProps) => (
+  <DialogPrimitive.Portal {...props}>
     <div className="fixed inset-0 z-50 flex items-start justify-center sm:items-center">
       {children}
     </div>

apps/webapp/app/components/primitives/Sheet.tsx

@@ -28,8 +28,8 @@ interface SheetPortalProps
   extends SheetPrimitive.DialogPortalProps,
     VariantProps<typeof portalVariants> {}
 
-const SheetPortal = ({ position, className, children, ...props }: SheetPortalProps) => (
-  <SheetPrimitive.Portal className={cn(className)} {...props}>
+const SheetPortal = ({ position, children, ...props }: SheetPortalProps) => (
+  <SheetPrimitive.Portal {...props}>
     <div className={portalVariants({ position })}>{children}</div>
   </SheetPrimitive.Portal>
 );

apps/webapp/package.json

@@ -188,6 +188,7 @@
     "@tailwindcss/forms": "^0.5.3",
     "@tailwindcss/typography": "^0.5.9",
     "@total-typescript/ts-reset": "^0.4.2",
+    "@trigger.dev/eslint-plugin": "workspace:*",
     "@types/bcryptjs": "^2.4.2",
     "@types/compression": "^1.7.2",
     "@types/eslint": "^8.4.6",
@@ -221,6 +222,9 @@
     "esbuild": "^0.15.10",
     "eslint": "^8.24.0",
     "eslint-config-prettier": "^8.5.0",
+    "eslint-plugin-import": "^2.29.1",
+    "eslint-plugin-react-hooks": "^4.6.2",
+    "eslint-plugin-turbo": "^2.0.4",
     "npm-run-all": "^4.1.5",
     "postcss-import": "^16.0.1",
     "postcss-loader": "^8.1.1",

package.json

@@ -53,6 +53,7 @@
     "@types/node": "18.17.1",
     "autoprefixer": "^10.4.12",
     "eslint-config-custom": "workspace:*",
+    "eslint-plugin-turbo": "^2.0.4",
     "prettier": "^3.0.0",
     "tsx": "^3.7.1",
     "turbo": "^1.10.3",

packages/core/package.json

@@ -21,6 +21,70 @@
       "require": "./dist/index.js",
       "types": "./dist/index.d.ts"
     },
+    "./eventFilterMatches": {
+      "import": {
+        "types": "./dist/eventFilterMatches.d.mts",
+        "default": "./dist/eventFilterMatches.mjs"
+      },
+      "require": "./dist/eventFilterMatches.js",
+      "types": "./dist/eventFilterMatches.d.ts"
+    },
+    "./replacements": {
+      "import": {
+        "types": "./dist/replacements.d.mts",
+        "default": "./dist/replacements.mjs"
+      },
+      "require": "./dist/replacements.js",
+      "types": "./dist/replacements.d.ts"
+    },
+    "./requestFilterMatches": {
+      "import": {
+        "types": "./dist/requestFilterMatches.d.mts",
+        "default": "./dist/requestFilterMatches.mjs"
+      },
+      "require": "./dist/requestFilterMatches.js",
+      "types": "./dist/requestFilterMatches.d.ts"
+    },
+    "./retry": {
+      "import": {
+        "types": "./dist/retry.d.mts",
+        "default": "./dist/retry.mjs"
+      },
+      "require": "./dist/retry.js",
+      "types": "./dist/retry.d.ts"
+    },
+    "./utils": {
+      "import": {
+        "types": "./dist/utils.d.mts",
+        "default": "./dist/utils.mjs"
+      },
+      "require": "./dist/utils.js",
+      "types": "./dist/utils.d.ts"
+    },
+    "./schemas": {
+      "import": {
+        "types": "./dist/schemas/index.d.mts",
+        "default": "./dist/schemas/index.mjs"
+      },
+      "require": "./dist/schemas/index.js",
+      "types": "./dist/schemas/index.d.ts"
+    },
+    "./types": {
+      "import": {
+        "types": "./dist/types.d.mts",
+        "default": "./dist/types.mjs"
+      },
+      "require": "./dist/types.js",
+      "types": "./dist/types.d.ts"
+    },
+    "./versions": {
+      "import": {
+        "types": "./dist/versions.d.mts",
+        "default": "./dist/versions.mjs"
+      },
+      "require": "./dist/versions.js",
+      "types": "./dist/versions.d.ts"
+    },
     "./v3": {
       "import": {
         "types": "./dist/v3/index.d.mts",
@@ -29,6 +93,22 @@
       "require": "./dist/v3/index.js",
       "types": "./dist/v3/index.d.ts"
     },
+    "./v3/errors": {
+      "import": {
+        "types": "./dist/v3/errors.d.mts",
+        "default": "./dist/v3/errors.mjs"
+      },
+      "require": "./dist/v3/errors.js",
+      "types": "./dist/v3/errors.d.ts"
+    },
+    "./v3/logger-api": {
+      "import": {
+        "types": "./dist/v3/logger-api.d.mts",
+        "default": "./dist/v3/logger-api.mjs"
+      },
+      "require": "./dist/v3/logger-api.js",
+      "types": "./dist/v3/logger-api.d.ts"
+    },
     "./v3/otel": {
       "import": {
         "types": "./dist/v3/otel/index.d.mts",
@@ -37,6 +117,62 @@
       "require": "./dist/v3/otel/index.js",
       "types": "./dist/v3/otel/index.d.ts"
     },
+    "./v3/semanticInternalAttributes": {
+      "import": {
+        "types": "./dist/v3/semanticInternalAttributes.d.mts",
+        "default": "./dist/v3/semanticInternalAttributes.mjs"
+      },
+      "require": "./dist/v3/semanticInternalAttributes.js",
+      "types": "./dist/v3/semanticInternalAttributes.d.ts"
+    },
+    "./v3/utils/durations": {
+      "import": {
+        "types": "./dist/v3/utils/durations.d.mts",
+        "default": "./dist/v3/utils/durations.mjs"
+      },
+      "require": "./dist/v3/utils/durations.js",
+      "types": "./dist/v3/utils/durations.d.ts"
+    },
+    "./v3/utils/flattenAttributes": {
+      "import": {
+        "types": "./dist/v3/utils/flattenAttributes.d.mts",
+        "default": "./dist/v3/utils/flattenAttributes.mjs"
+      },
+      "require": "./dist/v3/utils/flattenAttributes.js",
+      "types": "./dist/v3/utils/flattenAttributes.d.ts"
+    },
+    "./v3/utils/ioSerialization": {
+      "import": {
+        "types": "./dist/v3/utils/ioSerialization.d.mts",
+        "default": "./dist/v3/utils/ioSerialization.mjs"
+      },
+      "require": "./dist/v3/utils/ioSerialization.js",
+      "types": "./dist/v3/utils/ioSerialization.d.ts"
+    },
+    "./v3/utils/omit": {
+      "import": {
+        "types": "./dist/v3/utils/omit.d.mts",
+        "default": "./dist/v3/utils/omit.mjs"
+      },
+      "require": "./dist/v3/utils/omit.js",
+      "types": "./dist/v3/utils/omit.d.ts"
+    },
+    "./v3/utils/retries": {
+      "import": {
+        "types": "./dist/v3/utils/retries.d.mts",
+        "default": "./dist/v3/utils/retries.mjs"
+      },
+      "require": "./dist/v3/utils/retries.js",
+      "types": "./dist/v3/utils/retries.d.ts"
+    },
+    "./v3/utils/structuredLogger": {
+      "import": {
+        "types": "./dist/v3/utils/structuredLogger.d.mts",
+        "default": "./dist/v3/utils/structuredLogger.mjs"
+      },
+      "require": "./dist/v3/utils/structuredLogger.js",
+      "types": "./dist/v3/utils/structuredLogger.d.ts"
+    },
     "./v3/zodfetch": {
       "import": {
         "types": "./dist/v3/zodfetch.d.mts",
@@ -77,22 +213,6 @@
       "require": "./dist/v3/zodIpc.js",
       "types": "./dist/v3/zodIpc.d.ts"
     },
-    "./v3/utils/structuredLogger": {
-      "import": {
-        "types": "./dist/v3/utils/structuredLogger.d.mts",
-        "default": "./dist/v3/utils/structuredLogger.mjs"
-      },
-      "require": "./dist/v3/utils/structuredLogger.js",
-      "types": "./dist/v3/utils/structuredLogger.d.ts"
-    },
-    "./v3/utils/durations": {
-      "import": {
-        "types": "./dist/v3/utils/durations.d.mts",
-        "default": "./dist/v3/utils/durations.mjs"
-      },
-      "require": "./dist/v3/utils/durations.js",
-      "types": "./dist/v3/utils/durations.d.ts"
-    },
     "./v3/utils/timers": {
       "import": {
         "types": "./dist/v3/utils/timers.d.mts",

packages/core/src/index.ts

@@ -6,30 +6,4 @@ export * from "./replacements";
 export * from "./searchParams";
 export * from "./eventFilterMatches";
 export * from "./requestFilterMatches";
-
-export const API_VERSIONS = {
-  LAZY_LOADED_CACHED_TASKS: "2023-09-29",
-  SERIALIZED_TASK_OUTPUT: "2023-11-01",
-} as const;
-
-export const PLATFORM_FEATURES = {
-  yieldExecution: API_VERSIONS.LAZY_LOADED_CACHED_TASKS,
-  lazyLoadedCachedTasks: API_VERSIONS.LAZY_LOADED_CACHED_TASKS,
-};
-
-export function supportsFeature<TFeatureName extends keyof typeof PLATFORM_FEATURES>(
-  featureName: TFeatureName,
-  version: string
-): boolean {
-  if (version === "unversioned" || version === "unknown") {
-    return false;
-  }
-
-  const supportedVersion = PLATFORM_FEATURES[featureName];
-
-  if (!supportedVersion) {
-    return false;
-  }
-
-  return version >= supportedVersion;
-}
+export * from "./versions";

packages/core/src/versions.ts

@@ -0,0 +1,26 @@
+export const API_VERSIONS = {
+  LAZY_LOADED_CACHED_TASKS: "2023-09-29",
+  SERIALIZED_TASK_OUTPUT: "2023-11-01",
+} as const;
+
+export const PLATFORM_FEATURES = {
+  yieldExecution: API_VERSIONS.LAZY_LOADED_CACHED_TASKS,
+  lazyLoadedCachedTasks: API_VERSIONS.LAZY_LOADED_CACHED_TASKS,
+};
+
+export function supportsFeature<TFeatureName extends keyof typeof PLATFORM_FEATURES>(
+  featureName: TFeatureName,
+  version: string
+): boolean {
+  if (version === "unversioned" || version === "unknown") {
+    return false;
+  }
+
+  const supportedVersion = PLATFORM_FEATURES[featureName];
+
+  if (!supportedVersion) {
+    return false;
+  }
+
+  return version >= supportedVersion;
+}

packages/core/tsup.config.ts

@@ -4,21 +4,36 @@ export default defineConfig({
   ...packageOptions,
   config: "tsconfig.build.json",
   entry: [
+    "./src/eventFilterMatches.ts",
     "./src/index.ts",
+    "./src/replacements.ts",
+    "./src/requestFilterMatches.ts",
+    "./src/retry.ts",
+    "./src/schemas/index.ts",
+    "./src/types.ts",
+    "./src/utils.ts",
+    "./src/versions.ts",
+    "./src/v3/dev/index.ts",
+    "./src/v3/errors.ts",
     "./src/v3/index.ts",
+    "./src/v3/logger-api.ts",
     "./src/v3/otel/index.ts",
+    "./src/v3/prod/index.ts",
+    "./src/v3/schemas/index.ts",
+    "./src/v3/semanticInternalAttributes.ts",
+    "./src/v3/utils/durations.ts",
+    "./src/v3/utils/flattenAttributes.ts",
+    "./src/v3/utils/ioSerialization.ts",
+    "./src/v3/utils/omit.ts",
+    "./src/v3/utils/retries.ts",
+    "./src/v3/utils/structuredLogger.ts",
+    "./src/v3/workers/index.ts",
+    "./src/v3/zodfetch.ts",
+    "./src/v3/zodIpc.ts",
     "./src/v3/zodMessageHandler.ts",
     "./src/v3/zodNamespace.ts",
     "./src/v3/zodSocket.ts",
-    "./src/v3/zodIpc.ts",
-    "./src/v3/utils/structuredLogger.ts",
-    "./src/v3/utils/durations.ts",
     "./src/v3/utils/timers.ts",
-    "./src/v3/dev/index.ts",
-    "./src/v3/prod/index.ts",
-    "./src/v3/workers/index.ts",
-    "./src/v3/zodfetch.ts",
-    "./src/v3/schemas/index.ts",
   ],
   external: ["node:timers/promises"],
 });