From 96255a1387a1b5c174516a474986fcc0e8b55d7c Mon Sep 17 00:00:00 2001 From: Matt Luedke Date: Mon, 10 Jun 2019 10:28:10 -0400 Subject: [PATCH 1/2] fix: Revert JS dist file path to dist/js (#31) In commit 31a305d, we moved this repo to the `@silvermine` org and updated the `name` field in package.json. The Gruntfile uses the name of the package as the name of the JS output file. Therefore, when the package name field changed, so did the JS file output name and path. We no longer depend on the name field in package.json for the name of the JS output file. --- Gruntfile.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index 2e9eb68..da680dc 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -28,12 +28,13 @@ module.exports = function(grunt) { dist: { base: path.join(__dirname, 'dist'), + jsFileName: 'silvermine-videojs-quality-selector', }, }; config.dist.js = { - bundle: path.join(config.dist.base, 'js', '<%= pkg.name %>.js'), - minified: path.join(config.dist.base, 'js', '<%= pkg.name %>.min.js'), + bundle: path.join(config.dist.base, 'js', '<%= config.dist.jsFileName %>.js'), + minified: path.join(config.dist.base, 'js', '<%= config.dist.jsFileName %>.min.js'), }; config.dist.css = { From 3ce054324bc5d60daf9bdf2a81cc7995cc9da963 Mon Sep 17 00:00:00 2001 From: Matt Luedke Date: Mon, 10 Jun 2019 10:42:24 -0400 Subject: [PATCH 2/2] build: Add `clean` target to Gruntfile (#31) --- Gruntfile.js | 5 ++++ package-lock.json | 62 ++++++++++++++++++++++++----------------------- package.json | 3 ++- 3 files changed, 39 insertions(+), 31 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index da680dc..3f485c9 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -105,6 +105,10 @@ module.exports = function(grunt) { }, }, + clean: { + dist: config.dist.base, + }, + eslint: { target: config.js.all, }, @@ -140,6 +144,7 @@ module.exports = function(grunt) { grunt.loadNpmTasks('grunt-browserify'); grunt.loadNpmTasks('grunt-eslint'); grunt.loadNpmTasks('grunt-postcss'); + grunt.loadNpmTasks('grunt-contrib-clean'); grunt.loadNpmTasks('grunt-sass'); grunt.loadNpmTasks('grunt-sass-lint'); diff --git a/package-lock.json b/package-lock.json index 61d477d..697618c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2632,8 +2632,7 @@ "ansi-regex": { "version": "2.1.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "aproba": { "version": "1.2.0", @@ -2654,14 +2653,12 @@ "balanced-match": { "version": "1.0.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, "dev": true, - "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -2676,20 +2673,17 @@ "code-point-at": { "version": "1.1.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "concat-map": { "version": "0.0.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "console-control-strings": { "version": "1.1.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "core-util-is": { "version": "1.0.2", @@ -2806,8 +2800,7 @@ "inherits": { "version": "2.0.3", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "ini": { "version": "1.3.5", @@ -2819,7 +2812,6 @@ "version": "1.0.0", "bundled": true, "dev": true, - "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -2834,7 +2826,6 @@ "version": "3.0.4", "bundled": true, "dev": true, - "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -2842,14 +2833,12 @@ "minimist": { "version": "0.0.8", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "minipass": { "version": "2.2.4", "bundled": true, "dev": true, - "optional": true, "requires": { "safe-buffer": "^5.1.1", "yallist": "^3.0.0" @@ -2868,7 +2857,6 @@ "version": "0.5.1", "bundled": true, "dev": true, - "optional": true, "requires": { "minimist": "0.0.8" } @@ -2949,8 +2937,7 @@ "number-is-nan": { "version": "1.0.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "object-assign": { "version": "4.1.1", @@ -2962,7 +2949,6 @@ "version": "1.4.0", "bundled": true, "dev": true, - "optional": true, "requires": { "wrappy": "1" } @@ -3048,8 +3034,7 @@ "safe-buffer": { "version": "5.1.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "safer-buffer": { "version": "2.1.2", @@ -3085,7 +3070,6 @@ "version": "1.0.2", "bundled": true, "dev": true, - "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -3105,7 +3089,6 @@ "version": "3.0.1", "bundled": true, "dev": true, - "optional": true, "requires": { "ansi-regex": "^2.0.0" } @@ -3149,14 +3132,12 @@ "wrappy": { "version": "1.0.2", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "yallist": { "version": "3.0.2", "bundled": true, - "dev": true, - "optional": true + "dev": true } } }, @@ -3449,6 +3430,27 @@ } } }, + "grunt-contrib-clean": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/grunt-contrib-clean/-/grunt-contrib-clean-2.0.0.tgz", + "integrity": "sha512-g5ZD3ORk6gMa5ugZosLDQl3dZO7cI3R14U75hTM+dVLVxdMNJCPVmwf9OUt4v4eWgpKKWWoVK9DZc1amJp4nQw==", + "dev": true, + "requires": { + "async": "^2.6.1", + "rimraf": "^2.6.2" + }, + "dependencies": { + "async": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/async/-/async-2.6.2.tgz", + "integrity": "sha512-H1qVYh1MYhEEFLsP97cVKqCGo7KfCyTt6uEWqsTBr9SO84oK9Uwbyd/yCW+6rKJLHksBNUVWZDAjfS+Ccx0Bbg==", + "dev": true, + "requires": { + "lodash": "^4.17.11" + } + } + } + }, "grunt-contrib-uglify": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/grunt-contrib-uglify/-/grunt-contrib-uglify-4.0.1.tgz", diff --git a/package.json b/package.json index 8dd9905..cab668c 100644 --- a/package.json +++ b/package.json @@ -33,16 +33,17 @@ "expect.js": "0.3.1", "grunt": "1.0.4", "grunt-browserify": "5.3.0", + "grunt-contrib-clean": "2.0.0", "grunt-contrib-uglify": "4.0.1", "grunt-contrib-watch": "1.1.0", "grunt-eslint": "21.0.0", "grunt-postcss": "0.9.0", "grunt-sass": "3.0.2", - "node-sass": "4.12.0", "grunt-sass-lint": "0.2.4", "istanbul": "0.4.5", "mocha": "6.1.4", "mocha-lcov-reporter": "1.3.0", + "node-sass": "4.12.0", "rewire": "4.0.1", "silvermine-serverless-utils": "git+https://github.com/silvermine/serverless-utils.git#910f1149af824fc8d0fa840878079c7d3df0f414", "sinon": "7.3.2"