Skip to content

Commit

Permalink
chore(deps): Update to videojs v7 and add peer dep BREAKING CHANGE
Browse files Browse the repository at this point in the history
  • Loading branch information
@jackpope
jackpope committed Nov 22, 2019
1 parent a955846 commit e5fe85a
Show file tree
Hide file tree
Showing 4 changed files with 10,222 additions and 153 deletions.
1 change: 1 addition & 0 deletions .tool-versions
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
nodejs 10.15.2
322 changes: 176 additions & 146 deletions gulpfile.js
View file
Original file line number Diff line number Diff line change
@@ -1,173 +1,203 @@
const gulp = require('gulp'),
sourcemaps = require('gulp-sourcemaps'),
source = require('vinyl-source-stream'),
buffer = require('vinyl-buffer'),
browserify = require('browserify'),
watchify = require('watchify'),
insert = require('gulp-insert'),
babelify = require('babelify'),
stripComments = require('gulp-strip-comments'),
rename = require('gulp-rename'),
webserver = require('gulp-webserver'),
uglify = require('gulp-uglify'),
gutil = require('gulp-util'),
sass = require('gulp-sass'),
debug = require('gulp-debug'),
pump = require('pump'),
mocha = require('gulp-mocha'),
jshint = require('gulp-jshint'),
stylish = require('jshint-stylish'),
handlebars = require('gulp-handlebars'),
wrap = require('gulp-wrap'),
concat = require('gulp-concat'),
declare = require('gulp-declare'),
autoprefixer = require('gulp-autoprefixer');
const gulp = require("gulp"),
sourcemaps = require("gulp-sourcemaps"),
source = require("vinyl-source-stream"),
buffer = require("vinyl-buffer"),
browserify = require("browserify"),
watchify = require("watchify"),
insert = require("gulp-insert"),
babelify = require("babelify"),
stripComments = require("gulp-strip-comments"),
rename = require("gulp-rename"),
webserver = require("gulp-webserver"),
uglify = require("gulp-uglify"),
gutil = require("gulp-util"),
sass = require("gulp-sass"),
debug = require("gulp-debug"),
pump = require("pump"),
mocha = require("gulp-mocha"),
jshint = require("gulp-jshint"),
stylish = require("jshint-stylish"),
handlebars = require("gulp-handlebars"),
wrap = require("gulp-wrap"),
concat = require("gulp-concat"),
declare = require("gulp-declare"),
autoprefixer = require("gulp-autoprefixer");

const FILENAME = "videojs-annotation-comments.js",
CJSFILENAME = "videojs-annotation-comments.cjs.js"
PACKAGE = require('./package.json');
CJSFILENAME = "videojs-annotation-comments.cjs.js",
PACKAGE = require("./package.json");

//compilation function for browserify/bundler/transpilation
function compile(watch, cb){
var bundler = {
processor: watchify(
browserify('./src/js/index.js', { debug: true })
.transform(babelify)
),
filename: FILENAME
};

var bundlerCjs = {
processor: watchify(
browserify('./src/js/annotation_comments.js', { debug: true, standalone: 'AnnotationComments' })
.transform(
babelify,
{
presets: ["es2015"],
plugins: ["babel-plugin-transform-es2015-modules-simple-commonjs"]
}
)
),
filename: CJSFILENAME
};

function rebundle() {
for (b of [bundler, bundlerCjs]) {
b.processor.bundle()
.on('log', gutil.log)
.on('error', gutil.log.bind(gutil.colors.red, 'Browserify Error'))
.pipe(source('src/js/index.js'))
.pipe(rename(b.filename))
.pipe(buffer())
.pipe(sourcemaps.init({ loadMaps: true }))
.pipe(sourcemaps.write('./'))
.pipe(gulp.dest('./build'));
}
}

if (watch) {
rebundle();
bundler.processor.on('update', function() {
console.log('-> bundling...');
rebundle();
});
} else {
rebundle();
cb();
function compile(watch, cb) {
var bundler = {
processor: watchify(
browserify("./src/js/index.js", { debug: true }).transform(babelify)
),
filename: FILENAME
};

var bundlerCjs = {
processor: watchify(
browserify("./src/js/annotation_comments.js", {
debug: true,
standalone: "AnnotationComments"
}).transform(babelify, {
presets: ["es2015"],
plugins: ["babel-plugin-transform-es2015-modules-simple-commonjs"]
})
),
filename: CJSFILENAME
};

function rebundle() {
for (b of [bundler, bundlerCjs]) {
b.processor
.bundle()
.on("log", gutil.log)
.on("error", gutil.log.bind(gutil.colors.red, "Browserify Error"))
.pipe(source("src/js/index.js"))
.pipe(rename(b.filename))
.pipe(buffer())
.pipe(sourcemaps.init({ loadMaps: true }))
.pipe(sourcemaps.write("./"))
.pipe(gulp.dest("./build"));
}
}

if (watch) {
rebundle();
bundler.processor.on("update", function() {
console.log("-> bundling...");
rebundle();
});
} else {
rebundle();
cb();
}
}

// Get bundler from bundlify
function getBundler(path, options){
var bundler = browserify(path, { debug: options.debug, cache: {}, packageCache: {} });
bundler.transform(babelify, {presets: ["es2015"]})
bundler.on('log', gutil.log);
bundler.on('error', gutil.log.bind(gutil.colors.red, 'Browserify Error'));
return bundler;
};

gulp.task('dev_webserver', () => {
console.log(":::: > Test page at https://localhost:3004/test.html");
return gulp.src(['build','test','node_modules'])
.pipe(webserver({ port: 3004 }));
function getBundler(path, options) {
var bundler = browserify(path, {
debug: options.debug,
cache: {},
packageCache: {}
});
bundler.transform(babelify, { presets: ["es2015"] });
bundler.on("log", gutil.log);
bundler.on("error", gutil.log.bind(gutil.colors.red, "Browserify Error"));
return bundler;
}

gulp.task("dev_webserver", () => {
console.log(":::: > Test page at https://localhost:3004/test.html");
return gulp
.src(["build", "test", "node_modules"])
.pipe(webserver({ port: 3004 }));
});

gulp.task('sass', () => {
return gulp.src('src/css/*.scss')
.pipe(sass().on('error', sass.logError))
.pipe(autoprefixer({
browsers: ['defaults','not ie <= 9'],
cascade: false
}))
.pipe(sourcemaps.write('.'))
.pipe(gulp.dest('./build/css'))
.pipe(gulp.dest('./docs/build/css'));
gulp.task("sass", () => {
return gulp
.src("src/css/*.scss")
.pipe(sass().on("error", sass.logError))
.pipe(
autoprefixer({
browsers: ["defaults", "not ie <= 9"],
cascade: false
})
)
.pipe(sourcemaps.write("."))
.pipe(gulp.dest("./build/css"))
.pipe(gulp.dest("./docs/build/css"));
});

gulp.task('templates:watch', () => {
gulp.watch('./src/templates/**/*.hbs', ['templates']);
gulp.task("templates:watch", () => {
gulp.watch("./src/templates/**/*.hbs", ["templates"]);
});

gulp.task('sass:watch', () => {
gulp.watch('./src/css/**/*.scss', ['sass']);
gulp.task("sass:watch", () => {
gulp.watch("./src/css/**/*.scss", ["sass"]);
});

gulp.task('templates',() => {
gulp.src('./src/templates/**/*.hbs')
.pipe(handlebars({
handlebars: require('handlebars')
}))
.pipe(wrap('Handlebars.template(<%= contents %>)'))
.pipe(declare({
root: 'exports',
noRedeclare: true, // Avoid duplicate declarations
processName: function(filePath) {
// Allow nesting based on path using gulp-declare's processNameByPath()
// You can remove this option completely if you aren't using nested folders
// Drop the templates/ folder from the namespace path by removing it from the filePath
return declare.processNameByPath(filePath.replace('src/templates/', ''));
}
}))
.pipe(concat('templates.js'))
.pipe(wrap('var Handlebars = require("handlebars/runtime");\n <%= contents %>'))
.pipe(gulp.dest('./src/js/compiled/'));
gulp.task("templates", () => {
gulp
.src("./src/templates/**/*.hbs")
.pipe(
handlebars({
handlebars: require("handlebars")
})
)
.pipe(wrap("Handlebars.template(<%= contents %>)"))
.pipe(
declare({
root: "exports",
noRedeclare: true, // Avoid duplicate declarations
processName: function(filePath) {
// Allow nesting based on path using gulp-declare's processNameByPath()
// You can remove this option completely if you aren't using nested folders
// Drop the templates/ folder from the namespace path by removing it from the filePath
return declare.processNameByPath(
filePath.replace("src/templates/", "")
);
}
})
)
.pipe(concat("templates.js"))
.pipe(
wrap('var Handlebars = require("handlebars/runtime");\n <%= contents %>')
)
.pipe(gulp.dest("./src/js/compiled/"));
});

gulp.task('build', ['templates', 'sass', 'transpile'], (cb) => {
pump([
gulp.src('build/videojs-annotation-comments.js'),
rename(FILENAME.replace(".js",".min.js")),
stripComments(),
uglify(),
gulp.dest('./build')
]);

pump([
gulp.src('build/videojs-annotation-comments.cjs.js'),
rename(CJSFILENAME.replace(".js",".min.js")),
stripComments(),
uglify(),
gulp.dest('./build'),
gulp.dest('./docs/build')
], cb);
gulp.task("build", ["templates", "sass", "transpile"], cb => {
pump([
gulp.src("build/videojs-annotation-comments.js"),
rename(FILENAME.replace(".js", ".min.js")),
stripComments(),
uglify(),
gulp.dest("./build")
]);

pump(
[
gulp.src("build/videojs-annotation-comments.cjs.js"),
rename(CJSFILENAME.replace(".js", ".min.js")),
stripComments(),
uglify(),
gulp.dest("./build"),
gulp.dest("./docs/build")
],
cb
);
});

gulp.task('test', () => {
gulp.src(['test/mocha/components/*.js'], { read: false })
.pipe(mocha({ compilers: ['js:babel-core/register'] }));
gulp.task("test", () => {
gulp.src(["test/mocha/components/*.js"], { read: false }).pipe(mocha());
});

gulp.task('tdd', function() {
gulp.watch(['src/**/*.js', 'src/**/.hbs', 'test/mocha/components/*.js'], ['test']);
gulp.task("tdd", function() {
gulp.watch(
["src/**/*.js", "src/**/.hbs", "test/mocha/components/*.js"],
["test"]
);
});

gulp.task('lint', function() {
return gulp.src('./src/*/*.js')
.pipe(jshint('.jshintrc'))
gulp.task("lint", function() {
return gulp
.src("./src/*/*.js")
.pipe(jshint(".jshintrc"))
.pipe(jshint.reporter(stylish));
});

gulp.task('transpile', (cb) => compile(false, cb) );
gulp.task('bundle_watch', (cb) => compile(true, cb) );
gulp.task('watch', ['bundle_watch', 'dev_webserver', 'sass', 'sass:watch', 'templates', 'templates:watch', 'tdd']);
gulp.task('default', ['watch']);
gulp.task("transpile", cb => compile(false, cb));
gulp.task("bundle_watch", cb => compile(true, cb));
gulp.task("watch", [
"bundle_watch",
"dev_webserver",
"sass",
"sass:watch",
"templates",
"templates:watch",
"tdd"
]);
gulp.task("default", ["watch"]);
17 changes: 10 additions & 7 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@
"copyright": "Copyright Contently, Inc. <https://www.contently.com/>",
"license": "Apache-2.0",
"devDependencies": {
"@semantic-release/changelog": "^3.0.2",
"@semantic-release/changelog": "^3.0.4",
"babel-core": "^6.26.3",
"babel-plugin-transform-es2015-modules-simple-commonjs": "^0.3.0",
"babel-preset-es2015": "^6.24.1",
"babel-preset-es2015-script": "^1.1.0",
"babelify": "^7.3.0",
"browserify": "^16.2.3",
"chai": "^4.1.2",
"chai": "^4.2.0",
"es6-object-assign": "^1.1.0",
"gulp": "^3.9.1",
"gulp-autoprefixer": "^4.1.0",
Expand All @@ -47,16 +47,19 @@
"ie-array-find-polyfill": "^1.1.0",
"jshint": "^2.9.6",
"jshint-stylish": "~2.0.1",
"mocha": "^4.0.0",
"moment": "^2.22.1",
"mocha": "^6.2.0",
"moment": "^2.24.0",
"pump": "^1.0.3",
"semantic-release": "^15.13.3",
"underscore": "^1.9.0",
"video.js": "^6.9.0",
"semantic-release": "^15.13.21",
"underscore": "^1.9.1",
"video.js": "^7.6.0",
"vinyl-buffer": "^1.0.1",
"vinyl-source-stream": "^1.1.2",
"watchify": "^3.11.0"
},
"peerDependencies": {
"video.js": "^7"
},
"babel": {
"presets": [
"es2015"
Expand Down
Loading

0 comments on commit e5fe85a

Please sign in to comment.