diff --git a/Makefile b/Makefile index 5cfc0c2..6c9dd92 100644 --- a/Makefile +++ b/Makefile @@ -10,12 +10,10 @@ PROD_MT_CFLAGS := $(PROD_CFLAGS) $(MT_FLAGS) clean: rm -rf ./packages/core$(PKG_SUFFIX)/dist - rm -rf ./packages/core$(PKG_SUFFIX)/types .PHONY: build build: make clean PKG_SUFFIX="$(PKG_SUFFIX)" - cp -r src/types/ffmpeg-core packages/core$(PKG_SUFFIX)/types EXTRA_CFLAGS="$(EXTRA_CFLAGS)" \ EXTRA_LDFLAGS="$(EXTRA_LDFLAGS)" \ FFMPEG_ST="$(FFMPEG_ST)" \ diff --git a/packages/core-mt/package.json b/packages/core-mt/package.json index f97ab61..b003f3a 100644 --- a/packages/core-mt/package.json +++ b/packages/core-mt/package.json @@ -3,20 +3,14 @@ "version": "0.11.5", "description": "FFmpeg WebAssembly version", "main": "./dist/umd/ffmpeg-core.js", - "types": "./types/ffmpeg-core.d.ts", "exports": { ".": { - "types": "./types/ffmpeg-core.d.ts", "import": "./dist/esm/ffmpeg-core.js", "require": "./dist/umd/ffmpeg-core.js" } }, - "scripts": { - "lint": "eslint types" - }, "files": [ - "dist", - "types/ffmpeg-core.d.ts" + "dist" ], "repository": { "type": "git", @@ -40,11 +34,5 @@ "homepage": "https://github.com/ffmpegwasm/ffmpeg.wasm#readme", "publishConfig": { "access": "public" - }, - "devDependencies": { - "@typescript-eslint/eslint-plugin": "^5.37.0", - "@typescript-eslint/parser": "^5.37.0", - "eslint": "^8.23.1", - "typescript": "^4.8.3" } } diff --git a/packages/core/package.json b/packages/core/package.json index 75e9fa2..9ac74b9 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -3,20 +3,14 @@ "version": "0.11.5", "description": "FFmpeg WebAssembly version", "main": "./dist/umd/ffmpeg-core.js", - "types": "./types/ffmpeg-core.d.ts", "exports": { ".": { - "types": "./types/ffmpeg-core.d.ts", "import": "./dist/esm/ffmpeg-core.js", "require": "./dist/umd/ffmpeg-core.js" } }, - "scripts": { - "lint": "eslint types" - }, "files": [ - "dist", - "types/ffmpeg-core.d.ts" + "dist" ], "repository": { "type": "git", @@ -40,11 +34,5 @@ "homepage": "https://github.com/ffmpegwasm/ffmpeg.wasm#readme", "publishConfig": { "access": "public" - }, - "devDependencies": { - "@typescript-eslint/eslint-plugin": "^5.37.0", - "@typescript-eslint/parser": "^5.37.0", - "eslint": "^8.23.1", - "typescript": "^4.8.3" } } diff --git a/packages/ffmpeg-mt/.gitignore b/packages/ffmpeg-mt/.gitignore deleted file mode 100644 index 6bc1442..0000000 --- a/packages/ffmpeg-mt/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -dist/ -types/ diff --git a/packages/ffmpeg-mt/package.json b/packages/ffmpeg-mt/package.json deleted file mode 100644 index 033451e..0000000 --- a/packages/ffmpeg-mt/package.json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "name": "@ffmpeg/ffmpeg-mt", - "version": "0.11.5", - "description": "FFmpeg WebAssembly version w/ multi-thread", - "main": "./dist/umd/ffmpeg.js", - "types": "./types/ffmpeg.d.ts", - "exports": { - ".": { - "types": "./types/ffmpeg.d.ts", - "import": "./dist/esm/ffmpeg.js", - "require": "./dist/umd/ffmpeg.js" - } - }, - "scripts": { - "lint": "eslint types" - }, - "files": [ - "dist", - "types/ffmpeg.d.ts" - ], - "repository": { - "type": "git", - "url": "git+https://github.com/ffmpegwasm/ffmpeg.wasm.git" - }, - "keywords": [ - "ffmpeg", - "WebAssembly", - "video", - "audio", - "transcode" - ], - "author": "Jerome Wu ", - "license": "MIT", - "bugs": { - "url": "https://github.com/ffmpegwasm/ffmpeg.wasm/issues" - }, - "engines": { - "node": ">=16.6.0" - }, - "homepage": "https://github.com/ffmpegwasm/ffmpeg.wasm#readme", - "publishConfig": { - "access": "public" - }, - "devDependencies": { - "@typescript-eslint/eslint-plugin": "^5.37.0", - "@typescript-eslint/parser": "^5.37.0", - "eslint": "^8.23.1", - "typescript": "^4.8.3" - } -} diff --git a/packages/ffprobe-mt/.gitignore b/packages/ffprobe-mt/.gitignore deleted file mode 100644 index 6bc1442..0000000 --- a/packages/ffprobe-mt/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -dist/ -types/ diff --git a/src/types/ffmpeg-core/.eslintrc.cjs b/src/types/ffmpeg-core/.eslintrc.cjs deleted file mode 100644 index e663e67..0000000 --- a/src/types/ffmpeg-core/.eslintrc.cjs +++ /dev/null @@ -1,13 +0,0 @@ -module.exports = { - extends: [ - "eslint:recommended", - "plugin:@typescript-eslint/recommended", - "plugin:@typescript-eslint/recommended-requiring-type-checking", - ], - parser: "@typescript-eslint/parser", - parserOptions: { - tsconfigRootDir: __dirname, - project: ["../../../tsconfig.json"], - }, - plugins: ["@typescript-eslint"], -}; diff --git a/src/types/ffmpeg-core/ffmpeg-core.d.ts b/src/types/ffmpeg-core/ffmpeg-core.d.ts deleted file mode 100644 index 1bcd9bb..0000000 --- a/src/types/ffmpeg-core/ffmpeg-core.d.ts +++ /dev/null @@ -1,35 +0,0 @@ -type Pointer = number; -type StringPointer = Pointer; -type StringArrayPointer = Pointer; - -export interface FS { - mkdir: (fileName: string) => void; - readFile: (fileName: string) => Uint8Array; - readdir: (pathName: string) => string[]; - unlink: (fileName: string) => void; - writeFile: (fileName: string, binaryData: Uint8Array | string) => void; -} - -export interface Log { - type: string; - message: string; -} - -export interface FFmpegModule { - DEFAULT_ARGS: string[]; - FS: FS; - NULL: Pointer; - SIZE_I32: number; - - ret: number; - timeout: number; - - exec: (...args: string[]) => number; - reset: () => void; - setLogger: (logger: (log: Log) => void) => void; - setTimeout: (timeout: number) => void; - setProgress: (handler: (progress: number) => void) => void; -} - -declare function createFFmpeg(): Promise; -export default createFFmpeg;