diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml index 818fec28..b62ca6f6 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/node.js.yml @@ -16,7 +16,7 @@ jobs: strategy: matrix: - node-version: [16.x] + node-version: [12.x] # See supported Node.js release schedule at https://nodejs.org/en/about/releases/ steps: diff --git a/lib/utils/ffmpeg.js b/lib/utils/ffmpeg.js index 9b26d952..6150ac7b 100755 --- a/lib/utils/ffmpeg.js +++ b/lib/utils/ffmpeg.js @@ -15,7 +15,7 @@ const ffmpeg = require('fluent-ffmpeg'); const isArray = require('lodash/isArray'); const forEach = require('lodash/forEach'); const ffmpegInstaller = require('@ffmpeg-installer/ffmpeg'); -const ffprobeInstaller = require('@ffprobe-installer/ffprobe'); +const ffprobeInstaller = require('ffprobe-installer'); const Utils = require('./utils'); const FFmpegUtil = { diff --git a/package-lock.json b/package-lock.json index d8f77de6..c6601800 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,16 +1,15 @@ { "name": "ffcreator", - "version": "7.5.6", + "version": "7.5.7", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "ffcreator", - "version": "7.5.6", + "version": "7.5.7", "license": "MIT", "dependencies": { "@ffmpeg-installer/ffmpeg": "^1.1.0", - "@ffprobe-installer/ffprobe": "^2.1.2", "@tweenjs/tween.js": "18.5.0", "@xsstomy/subsrt": "^1.0.0", "browser-or-node": "^1.3.0", @@ -18,6 +17,7 @@ "echarts": "5.1.2", "eventemitter3": "^4.0.7", "ffmpeg-probe": "^1.0.6", + "ffprobe-installer": "^2.1.5", "fluent-ffmpeg": "^2.1.2", "fs-extra": "^9.0.1", "get-pixels": "^3.3.2", @@ -731,25 +731,6 @@ "darwin" ] }, - "node_modules/@ffprobe-installer/ffprobe": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/@ffprobe-installer/ffprobe/-/ffprobe-2.1.2.tgz", - "integrity": "sha512-ZNvwk4f2magF42Zji2Ese16SMj9BS7Fui4kRjg6gTYTxY3gWZNpg85n4MIfQyI9nimHg4x/gT6FVkp/bBDuBwg==", - "license": "LGPL-2.1", - "engines": { - "node": ">=14.21.2" - }, - "optionalDependencies": { - "@ffprobe-installer/darwin-arm64": "5.0.1", - "@ffprobe-installer/darwin-x64": "5.1.0", - "@ffprobe-installer/linux-arm": "5.2.0", - "@ffprobe-installer/linux-arm64": "5.2.0", - "@ffprobe-installer/linux-ia32": "5.2.0", - "@ffprobe-installer/linux-x64": "5.2.0", - "@ffprobe-installer/win32-ia32": "5.1.0", - "@ffprobe-installer/win32-x64": "5.1.0" - } - }, "node_modules/@ffprobe-installer/linux-arm": { "version": "5.2.0", "resolved": "https://registry.npmjs.org/@ffprobe-installer/linux-arm/-/linux-arm-5.2.0.tgz", @@ -4802,6 +4783,25 @@ "execa": "^0.10.0" } }, + "node_modules/ffprobe-installer": { + "version": "2.1.5", + "resolved": "https://registry.npmjs.org/ffprobe-installer/-/ffprobe-installer-2.1.5.tgz", + "integrity": "sha512-z6uBwhxRsIdqENiWAKVhB51Q0/ZIwU3K3LhmR5vGo7FDUQnc80EFLzhsW4BlyBexnIS/225xGsjcQkBp40RCig==", + "license": "LGPL-2.1", + "engines": { + "node": ">=14.21.2" + }, + "optionalDependencies": { + "@ffprobe-installer/darwin-arm64": "5.0.1", + "@ffprobe-installer/darwin-x64": "5.1.0", + "@ffprobe-installer/linux-arm": "5.2.0", + "@ffprobe-installer/linux-arm64": "5.2.0", + "@ffprobe-installer/linux-ia32": "5.2.0", + "@ffprobe-installer/linux-x64": "5.2.0", + "@ffprobe-installer/win32-ia32": "5.1.0", + "@ffprobe-installer/win32-x64": "5.1.0" + } + }, "node_modules/figures": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz", diff --git a/package.json b/package.json index 92d1c8c5..00c8cbe8 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ffcreator", - "version": "7.5.6", + "version": "7.5.7", "description": "FFCreator is a lightweight and flexible short video production library", "main": "lib/index.js", "types": "types/index.d.ts", @@ -23,7 +23,7 @@ "license": "MIT", "dependencies": { "@ffmpeg-installer/ffmpeg": "^1.1.0", - "@ffprobe-installer/ffprobe": "^2.1.2", + "ffprobe-installer": "^2.1.5", "@tweenjs/tween.js": "18.5.0", "@xsstomy/subsrt": "^1.0.0", "browser-or-node": "^1.3.0",