Skip to content

Commit

Permalink
fix: Remove the postinstall script to prevent install issues (#138)
Browse files Browse the repository at this point in the history
  • Loading branch information
misteroneill authored Sep 5, 2018
1 parent 1e77e8c commit a2b2839
Show file tree
Hide file tree
Showing 3 changed files with 73 additions and 54 deletions.
97 changes: 55 additions & 42 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

19 changes: 9 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"videojs-plugin"
],
"generator-videojs-plugin": {
"version": "7.2.0"
"version": "7.2.4"
},
"scripts": {
"prebuild": "npm run clean",
Expand All @@ -26,10 +26,10 @@
"clean": "shx rm -rf ./dist ./test/dist",
"postclean": "shx mkdir -p ./dist ./test/dist",
"docs": "npm-run-all docs:*",
"docs:api": "jsdoc src -g plugins/markdown -r -c scripts/jsdoc.json -d docs/api",
"docs:api": "jsdoc src -g plugins/markdown -r -d docs/api",
"docs:toc": "doctoc README.md",
"lint": "vjsstandard",
"server": "karma start scripts/karma.conf.js --singleRun=false --auto-watch --no-browsers",
"server": "karma start scripts/karma.conf.js --singleRun=false --auto-watch",
"start": "npm-run-all -p server watch",
"pretest": "npm-run-all lint build",
"test": "karma start scripts/karma.conf.js",
Expand All @@ -40,8 +40,7 @@
"watch:css": "npm run build:css -- -w",
"watch:js": "npm run build:js -- -w",
"prepublish": "not-in-install && npm run build && pkg-ok || in-install",
"posttest": "shx cat test/dist/coverage/text.txt",
"postinstall": "shx test -d .git && npm-merge-driver install || in-install"
"posttest": "shx cat test/dist/coverage/text.txt"
},
"vjsstandard": {
"ignore": [
Expand Down Expand Up @@ -76,16 +75,16 @@
"not-prerelease": "^1.0.1",
"npm-run-all": "^4.1.3",
"postcss-cli": "^6.0.0",
"rollup": "^0.64.1",
"rollup": "^0.65.0",
"shx": "^0.3.2",
"sinon": "^6.1.5",
"videojs-generate-karma-config": "~2.0.0",
"videojs-generate-karma-config": "~3.0.0",
"videojs-generate-postcss-config": "~2.0.1",
"videojs-generate-rollup-config": "~2.0.1",
"videojs-generate-rollup-config": "~2.1.0",
"videojs-languages": "^1.0.0",
"videojs-standard": "^7.0.1",
"npm-merge-driver": "^2.3.5",
"pkg-ok": "^2.2.0"
"pkg-ok": "^2.2.0",
"npm-merge-driver-install": "^1.0.0"
},
"browserslist": [
"defaults",
Expand Down
11 changes: 9 additions & 2 deletions scripts/karma.conf.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
const generate = require('videojs-generate-karma-config');

module.exports = function(config) {
config = generate(config);
// any custom stuff here!

// see https://github.com/videojs/videojs-generate-karma-config
// for options
const options = {};

config = generate(config, options);

// any other custom stuff not supported by options here!
};

0 comments on commit a2b2839

Please sign in to comment.