Skip to content

Commit 5edecf7

Browse files
authored
fix: Remove the postinstall script to prevent install issues (#77)
1 parent 7e0b357 commit 5edecf7

File tree

3 files changed

+73
-54
lines changed

3 files changed

+73
-54
lines changed

package-lock.json

+55-42
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+9-10
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@
2626
"clean": "shx rm -rf ./dist ./test/dist",
2727
"postclean": "shx mkdir -p ./dist ./test/dist",
2828
"docs": "npm-run-all docs:*",
29-
"docs:api": "jsdoc src -g plugins/markdown -r -c scripts/jsdoc.json -d docs/api",
29+
"docs:api": "jsdoc src -g plugins/markdown -r -d docs/api",
3030
"docs:toc": "doctoc README.md",
3131
"lint": "vjsstandard",
32-
"server": "karma start scripts/karma.conf.js --singleRun=false --auto-watch --no-browsers",
32+
"server": "karma start scripts/karma.conf.js --singleRun=false --auto-watch",
3333
"start": "npm-run-all -p server watch",
3434
"pretest": "npm-run-all lint build",
3535
"test": "karma start scripts/karma.conf.js",
@@ -40,8 +40,7 @@
4040
"watch:css": "npm run build:css -- -w",
4141
"watch:js": "npm run build:js -- -w",
4242
"prepublish": "not-in-install && npm run build && pkg-ok || in-install",
43-
"posttest": "shx cat test/dist/coverage/text.txt",
44-
"postinstall": "shx test -d .git && npm-merge-driver install || in-install"
43+
"posttest": "shx cat test/dist/coverage/text.txt"
4544
},
4645
"dependencies": {
4746
"global": "^4.3.2",
@@ -60,15 +59,15 @@
6059
"not-prerelease": "^1.0.1",
6160
"npm-run-all": "^4.1.3",
6261
"postcss-cli": "^6.0.0",
63-
"rollup": "^0.64.1",
62+
"rollup": "^0.65.0",
6463
"shx": "^0.3.2",
6564
"sinon": "^6.1.5",
66-
"videojs-generate-karma-config": "~2.0.0",
65+
"videojs-generate-karma-config": "~3.0.0",
6766
"videojs-generate-postcss-config": "~2.0.1",
68-
"videojs-generate-rollup-config": "~2.0.1",
67+
"videojs-generate-rollup-config": "~2.1.0",
6968
"videojs-standard": "^7.0.1",
70-
"npm-merge-driver": "^2.3.5",
71-
"pkg-ok": "^2.2.0"
69+
"pkg-ok": "^2.2.0",
70+
"npm-merge-driver-install": "^1.0.0"
7271
},
7372
"style": "dist/videojs-overlay.css",
7473
"videojs-plugin": {
@@ -85,7 +84,7 @@
8584
"test/"
8685
],
8786
"generator-videojs-plugin": {
88-
"version": "7.2.0"
87+
"version": "7.2.4"
8988
},
9089
"browserslist": [
9190
"defaults",

scripts/karma.conf.js

+9-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
const generate = require('videojs-generate-karma-config');
22

33
module.exports = function(config) {
4-
config = generate(config);
5-
// any custom stuff here!
4+
5+
// see https://github.com/videojs/videojs-generate-karma-config
6+
// for options
7+
const options = {};
8+
9+
config = generate(config, options);
10+
11+
// any other custom stuff not supported by options here!
612
};
13+

0 commit comments

Comments
 (0)