Skip to content

Commit da1ac6e

Browse files
committed
Merge branch 'develop' into add-voiced-captions
2 parents 8302453 + 1c26095 commit da1ac6e

107 files changed

Lines changed: 2833 additions & 1465 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitignore‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
.DS_Store
22
test.html
3-
thirdparty/jwplayer.*
4-
thirdparty/jquery-*.js
53
node_modules/
64
npm-debug.log
75
translations/???.js
86
.idea
97
.htaccess
108
docs
11-
jsdoc.json
9+
jsdoc.json

‎.npmignore‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
.DS_Store
2+
test.html
3+
node_modules/
4+
npm-debug.log
5+
translations/???.js
6+
.idea
7+
.htaccess
8+
docs
9+
jsdoc.json
10+
.git
11+
.github
12+
demos
13+
media

‎Gruntfile.cjs‎

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
module.exports = function (grunt) {
2+
grunt.loadNpmTasks("grunt-contrib-copy");
3+
grunt.loadNpmTasks("grunt-contrib-cssmin");
4+
grunt.loadNpmTasks("grunt-contrib-clean");
5+
grunt.loadNpmTasks('grunt-run');
6+
grunt.loadNpmTasks('grunt-eslint');
7+
8+
grunt.initConfig({
9+
pkg: grunt.file.readJSON("package.json"),
10+
cssmin: {
11+
min: {
12+
src: ["styles/ableplayer.css"],
13+
dest: "build/<%= pkg.name %>.min.css",
14+
},
15+
options: {
16+
// Add a banner with the package name and version
17+
// (no date, otherwise a new build is different even if the code didn't change!)
18+
// (oddly, here we don't need a '\n' at the end!)
19+
banner: "/*! <%= pkg.name %> V<%= pkg.version %> */",
20+
},
21+
},
22+
run: {
23+
rollup: {
24+
cmd: 'npm',
25+
args: ['exec', 'rollup', '--', '-c'],
26+
},
27+
jest: {
28+
cmd: 'npm',
29+
args: ['exec', 'jest', '--', '--colors']
30+
},
31+
types: {
32+
cmd: 'npx',
33+
args: ['tsc']
34+
},
35+
},
36+
copy: {
37+
dompurify: {
38+
files: {
39+
'build/separate-dompurify/purify.min.js': ['/node_modules/dompurify/dist/purify.min.js'],
40+
}
41+
}
42+
},
43+
eslint: {
44+
target: ['scripts/*.js'],
45+
},
46+
clean: {
47+
build: ["build"],
48+
},
49+
});
50+
51+
grunt.registerTask("default", [
52+
"run:rollup",
53+
"run:types",
54+
"copy:dompurify",
55+
"cssmin",
56+
]);
57+
grunt.registerTask("test", ["eslint"]);
58+
grunt.registerTask("jest", ["run:rollup", "run:jest"]);
59+
};

‎Gruntfile.js‎

Lines changed: 0 additions & 185 deletions
This file was deleted.

0 commit comments

Comments
 (0)