1
0
mirror of https://github.com/videojs/video.js.git synced 2025-11-06 09:19:15 +02:00

chore: update videojs-generate-karma-config to ~5.2.1 and remove patches (#6104)

This commit is contained in:
Brandon Casey
2019-07-18 15:09:54 -04:00
committed by Gary Katsevman
parent 93a6bbd341
commit b9fbd0bbaa
4 changed files with 711 additions and 748 deletions

1422
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@@ -68,7 +68,6 @@
"docs:fix": "remark --output -- './{,!(node_modules)/**/}!(CHANGELOG)*.md'",
"docs:lang": "node build/translations.js",
"netlify": "babel-node ./build/netlify-docs.js",
"prepare": "patch-package",
"prepublishOnly": "run-p build",
"publish": "node build/gh-release.js",
"version": "node build/version.js && git add CHANGELOG.md",
@@ -125,7 +124,6 @@
"minimist": "^1.2.0",
"npm-merge-driver-install": "^1.1.1",
"npm-run-all": "^4.1.5",
"patch-package": "^6.1.2",
"postcss-cli": "^6.1.2",
"proxyquireify": "^3.2.1",
"qunit": "^2.9.2",
@@ -153,7 +151,7 @@
"uglify-js": "^3.6.0",
"unified": "^7.0.2",
"videojs-flash": "^2.2.0",
"videojs-generate-karma-config": "~5.2.0",
"videojs-generate-karma-config": "~5.2.1",
"videojs-languages": "^2.0.0",
"videojs-standard": "^8.0.3",
"watchify": "^3.11.1",

View File

@@ -1,15 +0,0 @@
patch-package
--- a/node_modules/karma-safari-launcher/index.js
+++ b/node_modules/karma-safari-launcher/index.js
@@ -13,6 +13,11 @@ var SafariBrowser = function(baseBrowserDecorator) {
var content = data.toString().replace('%URL%', url);
var staticHtmlPath = self._tempDir + '/redirect.html';
+ var pathForMojave = path.join(process.env.HOME, 'Library/Containers/com.apple.Safari/Data/redirect.html');
+ if (fs.existsSync(pathForMojave)) {
+ staticHtmlPath = pathForMojave;
+ }
+
fs.writeFile(staticHtmlPath, content, function(err) {
self._execCommand(self._getCommand(), [staticHtmlPath]);
});

View File

@@ -1,18 +0,0 @@
patch-package
--- a/node_modules/karma-safaritechpreview-launcher/index.js
+++ b/node_modules/karma-safaritechpreview-launcher/index.js
@@ -25,7 +25,13 @@ const SafariTechPreviewBrowser = function (baseBrowserDecorator) {
throw err;
}
const content = data.toString().replace('%URL%', url);
- const staticHtmlPath = self._tempDir + '/redirect.html';
+ var staticHtmlPath = self._tempDir + '/redirect.html';
+
+ var pathForMojave = path.join(process.env.HOME, 'Library/Containers/com.apple.SafariTechnologyPreview/Data/redirect.html');
+ if (fs.existsSync(pathForMojave)) {
+ staticHtmlPath = pathForMojave;
+ }
+
try {
yield fs.writeFile(staticHtmlPath, content);
} catch (err) {