From 4ec3d3a67ae230838264bd07183d0bd75d3d09e2 Mon Sep 17 00:00:00 2001 From: Joey Parrish Date: Tue, 15 Dec 2015 20:01:02 -0800 Subject: [PATCH] Clean up node metadata - Fix dev-dependency installation - Fix npm license format warning - Ignore node_modules Now dev-deps can be installed simply by running "npm install". Because of npm/npm#3059, this requires the in-publish module. Change-Id: Idc2eeca5b172de50760a6fadacb1d1088985f840 --- .gitignore | 1 + karma.conf.js | 11 +---------- package.json | 11 +++-------- 3 files changed, 5 insertions(+), 18 deletions(-) diff --git a/.gitignore b/.gitignore index 584f9c0fa..7ff47849e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ *.pyc +node_modules third_party/closure/goog/deps.js shaka-player.compiled.js shaka-player.compiled.debug.js diff --git a/karma.conf.js b/karma.conf.js index f54567985..4cffa3150 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -1,14 +1,5 @@ // Karma configuration - -// Required modules: -// karma -// karma-jasmine -// karma-jasmine-ajax -// jasmine -// jasmine-ajax -// jasmine-core -// Optional modules: -// karma-coverage +// Install required modules by running "npm install" module.exports = function(config) { config.set({ diff --git a/package.json b/package.json index 69983287f..9fbfbd01f 100644 --- a/package.json +++ b/package.json @@ -11,6 +11,7 @@ } ], "devDependencies": { + "in-publish": "", "karma": ">=0.13.9 <= 0.13.14", "karma-coverage": "", "karma-jasmine": "", @@ -32,14 +33,8 @@ "bugs": { "url": "https://github.com/google/shaka-player/issues" }, - "license": "Apache License 2.0", - "licenses": [ - { - "type": "Apache", - "url": "https://github.com/google/shaka-player/blob/master/LICENSE" - } - ], + "license": "Apache-2.0", "scripts": { - "prepublish": "./build/checkversion.sh && ./build/all.sh" + "prepublish": "in-publish && ./build/checkversion.sh && ./build/all.sh || not-in-publish" } }