Merge remote-tracking branch 'origin/main' into feat/support-novita-async-t2v

Author: SBrandeis

.github/workflows/inference-publish.yml

@@ -52,6 +52,7 @@ jobs:
           BUMPED_VERSION=$(node -p "require('semver').inc('$PACKAGE_VERSION', '${{ github.event.inputs.newversion }}')")
           # Update package.json with the new version
           node -e "const fs = require('fs'); const package = JSON.parse(fs.readFileSync('./package.json')); package.version = '$BUMPED_VERSION'; fs.writeFileSync('./package.json', JSON.stringify(package, null, '\t') + '\n');"
+          pnpm --filter inference package-to-ts
           pnpm --filter doc-internal run fix-cdn-versions
           git add ../..
           git commit -m "🔖 @huggingface/inference $BUMPED_VERSION"

.gitignore

@@ -6,6 +6,7 @@ yarn-debug.log*
 yarn-error.log*
 lerna-debug.log*
 
+.tshy-build
 # Diagnostic reports (https://nodejs.org/api/report.html)
 report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json
 

packages/hub/src/lib/cache-management.spec.ts

@@ -8,7 +8,7 @@ import {
 	type CachedFileInfo,
 } from "./cache-management";
 import { stat, readdir, realpath, lstat } from "node:fs/promises";
-import type { Dirent, Stats } from "node:fs";
+import type { Stats } from "node:fs";
 import { join } from "node:path";
 
 // Mocks
@@ -86,7 +86,9 @@ describe("scanSnapshotDir", () => {
 	test("should scan a valid snapshot directory", async () => {
 		const cachedFiles: CachedFileInfo[] = [];
 		const blobStats = new Map<string, Stats>();
-		vi.mocked(readdir).mockResolvedValueOnce([{ name: "file1", isDirectory: () => false } as Dirent]);
+		vi.mocked(readdir).mockResolvedValueOnce([
+			{ name: "file1", isDirectory: () => false } as unknown as Awaited<ReturnType<typeof readdir>>[0],
+		]);
 
 		vi.mocked(realpath).mockResolvedValueOnce("/fake/realpath");
 		vi.mocked(lstat).mockResolvedValueOnce({ size: 1024, atimeMs: Date.now(), mtimeMs: Date.now() } as Stats);

packages/inference/.eslintignore

@@ -1,3 +1,4 @@
 dist
 tapes.json
-src/vendor
+src/vendor
+.tshy-build

packages/inference/.prettierignore

@@ -3,4 +3,6 @@ pnpm-lock.yaml
 README.md
 dist
 test/tapes.json
-src/vendor
+src/vendor
+.tshy-build
+.tshy

packages/inference/.tshy/build.json

@@ -0,0 +1,8 @@
+{
+  "extends": "../tsconfig.json",
+  "compilerOptions": {
+    "rootDir": "../src",
+    "module": "nodenext",
+    "moduleResolution": "nodenext"
+  }
+}

packages/inference/.tshy/commonjs.json

@@ -0,0 +1,16 @@
+{
+  "extends": "./build.json",
+  "include": [
+    "../src/**/*.ts",
+    "../src/**/*.cts",
+    "../src/**/*.tsx",
+    "../src/**/*.json"
+  ],
+  "exclude": [
+    "../src/**/*.mts",
+    "../src/package.json"
+  ],
+  "compilerOptions": {
+    "outDir": "../.tshy-build/commonjs"
+  }
+}

packages/inference/.tshy/esm.json

@@ -0,0 +1,15 @@
+{
+  "extends": "./build.json",
+  "include": [
+    "../src/**/*.ts",
+    "../src/**/*.mts",
+    "../src/**/*.tsx",
+    "../src/**/*.json"
+  ],
+  "exclude": [
+    "../src/package.json"
+  ],
+  "compilerOptions": {
+    "outDir": "../.tshy-build/esm"
+  }
+}

packages/inference/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@huggingface/inference",
-	"version": "3.13.2",
+	"version": "3.14.0",
 	"packageManager": "[email protected]",
 	"license": "MIT",
 	"author": "Hugging Face and Tim Mikeladze <[email protected]>",
@@ -30,18 +30,18 @@
 		"!src/snippets/templates/**/*.jinja"
 	],
 	"source": "src/index.ts",
-	"types": "./dist/src/index.d.ts",
-	"main": "./dist/index.cjs",
-	"module": "./dist/index.js",
-	"exports": {
-		"types": "./dist/src/index.d.ts",
-		"require": "./dist/index.cjs",
-		"import": "./dist/index.js"
+	"types": "./dist/commonjs/index.d.ts",
+	"main": "./dist/commonjs/index.js",
+	"module": "./dist/esm/index.js",
+	"tshy": {
+		"exports": {
+			"./package.json": "./package.json",
+			".": "./src/index.ts"
+		}
 	},
 	"type": "module",
 	"scripts": {
-		"build": "pnpm run export-templates && tsup src/index.ts --format cjs,esm --clean && tsc --emitDeclarationOnly --declaration",
-		"dts": "tsx scripts/generate-dts.ts && tsc --noEmit dist/index.d.ts",
+		"build": "pnpm run export-templates && pnpm run package-to-ts && tshy",
 		"lint": "eslint --quiet --fix --ext .cjs,.ts .",
 		"lint:check": "eslint --ext .cjs,.ts .",
 		"format": "prettier --write .",
@@ -52,7 +52,8 @@
 		"test:browser": "vitest run --browser.name=chrome --browser.headless --config vitest.config.mts",
 		"check": "tsc",
 		"dev": "pnpm run export-templates && tsup src/index.ts --format cjs,esm --watch",
-		"export-templates": "tsx scripts/export-templates.ts"
+		"export-templates": "tsx scripts/export-templates.ts",
+		"package-to-ts": "tsx scripts/package-json-to-ts.ts"
 	},
 	"dependencies": {
 		"@huggingface/tasks": "workspace:^",
@@ -61,5 +62,18 @@
 	"devDependencies": {
 		"@types/node": "18.13.0"
 	},
-	"resolutions": {}
+	"resolutions": {},
+	"exports": {
+		"./package.json": "./package.json",
+		".": {
+			"import": {
+				"types": "./dist/esm/index.d.ts",
+				"default": "./dist/esm/index.js"
+			},
+			"require": {
+				"types": "./dist/commonjs/index.d.ts",
+				"default": "./dist/commonjs/index.js"
+			}
+		}
+	}
 }