Skip to content

Commit de35078

Browse files
authored
Merge branch 'master' into master
2 parents 98fa625 + 3b701de commit de35078

File tree

7 files changed

+89
-129
lines changed

7 files changed

+89
-129
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@ Try it: [https://ffmpegwasm.netlify.app](https://ffmpegwasm.netlify.app#demo)
3636
$ npm install @ffmpeg/ffmpeg @ffmpeg/core
3737
```
3838

39-
> As we are using the latest experimental features, you need to add few flags to run in Node.js
39+
> As we are using experimental features, you need to add flags to run in Node.js
4040
4141
```
42-
$ node --experimental-wasm-threads --experimental-wasm-bulk-memory transcode.js
42+
$ node --experimental-wasm-threads transcode.js
4343
```
4444

4545
**Browser**

package-lock.json

Lines changed: 29 additions & 118 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"wait": "rimraf dist && wait-on http://localhost:3000/dist/ffmpeg.dev.js",
1616
"test": "npm-run-all -p -r start test:all",
1717
"test:all": "npm-run-all wait test:browser:ffmpeg test:node:all",
18-
"test:node": "node --experimental-wasm-threads --experimental-wasm-bulk-memory node_modules/.bin/_mocha --exit --bail --require ./scripts/test-helper.js",
18+
"test:node": "node --experimental-wasm-threads node_modules/.bin/_mocha --exit --bail --require ./scripts/test-helper.js",
1919
"test:node:all": "npm run test:node -- ./tests/*.test.js",
2020
"test:browser": "mocha-headless-chrome -a allow-file-access-from-files -a incognito -a no-sandbox -a disable-setuid-sandbox -a disable-logging -t 300000",
2121
"test:browser:ffmpeg": "npm run test:browser -- -f ./tests/ffmpeg.test.html"

scripts/webpack.config.dev.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
const path = require('path');
2-
const webpack = require('webpack');
32
const common = require('./webpack.config.common');
43

54
const genConfig = ({

0 commit comments

Comments
 (0)