diff --git a/_install_deps.js b/_install_deps.js deleted file mode 100755 index fe1f543451a6..000000000000 --- a/_install_deps.js +++ /dev/null @@ -1,43 +0,0 @@ -/** - * @license - * Copyright 2016 Google Inc. All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -'use strict'; - -const exec = require('child_process').exec; - -const cwd = require('path').resolve(); -const corePath = `${cwd}/lighthouse-core`; -const extPath = `${cwd}/lighthouse-extension`; - -const npm = 'npm --prefix'; -const cmd = `${npm} ${corePath} install ${corePath} && ${npm} ${extPath} install ${extPath}`; - -// Tell the user what command we're about to execute -console.log(cmd); -console.log('...'); - -exec(cmd, - function(error, stdout, stderr) { - process.stderr.write(stderr); - process.stdout.write(stdout); - if (stdout.length === 0) { - console.log('The full install may not have completed.'); - console.log('To manually install child dependencies:'); - console.log(` ${cmd}`); - } - }); - diff --git a/lighthouse-core/test/index.js b/lighthouse-core/test/index.js index 0844b8017bbb..f62cc393343d 100644 --- a/lighthouse-core/test/index.js +++ b/lighthouse-core/test/index.js @@ -18,7 +18,7 @@ /* eslint-env mocha */ -const pkg = require('../package.json'); +const pkg = require('../../package.json'); const assert = require('assert'); describe('Module Tests', function() { diff --git a/package.json b/package.json index c3e4737b08b5..c19716a897b2 100644 --- a/package.json +++ b/package.json @@ -9,30 +9,47 @@ }, "scripts": { "//": "// passing through tasks to core", - "postinstall": "node _install_deps.js", "lint": "eslint .", "smoke": "lighthouse-cli/scripts/run-smoke-tests.sh", "coverage": "node $(echo $__node_harmony) $(npm bin)/istanbul cover -x \"**/third_party/**\" _mocha -- $(find */test -name '*.js') --timeout 60000", "coveralls": "npm run coverage && cat ./coverage/lcov.info | coveralls", "start": "node ./lighthouse-cli/index.js", "test": "npm run lint --silent && npm run unit && npm run closure", - "cli-unit": "mocha $(echo $__node_harmony) $(find lighthouse-cli/test -name '*.js') --timeout 60000", - "unit": "npm run cli-unit && npm --prefix ./lighthouse-core run unit", + "cli-unit": "mocha $(echo $__node_harmony) $(find lighthouse-cli/test lighthouse-core/test -name '*.js') --timeout 60000", + "unit": "npm run cli-unit", "//": "// passing through tasks to core", - "closure": "npm --prefix ./lighthouse-core run closure", - "watch": "npm --prefix ./lighthouse-core run watch", - "chrome": "npm --prefix ./lighthouse-core run chrome" + "closure": "cd lighthouse-core && closure/closure-type-checking.js", + "watch": "find lighthouse-core lighthouse-cli -name '*.js' -not -path '*/node_modules/*' -not -path '*/extension/*' | entr npm run unit", + "chrome": "lighthouse-core/scripts/launch-chrome.sh" }, "devDependencies": { - "mocha": "^2.3.3", - "eslint": "^2.4.0", + "coveralls": "^2.11.9", "eslint-config-google": "^0.4.0", + "eslint": "^2.4.0", + "google-closure-compiler": "^20160517.0.0", + "gulp-replace": "^0.5.4", + "gulp-util": "^3.0.7", + "gulp": "^3.9.1", "istanbul": "^0.4.3", - "coveralls": "^2.11.9" + "jsdom": "^9.0.0", + "mkdirp": "^0.5.1", + "mocha": "^2.3.3", + "request": "^2.69.0", + "walk": "^2.3.9" }, "dependencies": { + "axe-core": "^1.1.1", + "chrome-devtools-frontend": "1.0.401423", + "chrome-remote-interface": "^0.11.0", + "debug": "^2.2.0", + "devtools-timeline-model": "1.1.6", + "gl-matrix": "2.3.2", + "handlebars": "^4.0.5", + "json-stringify-safe": "^5.0.1", + "jszip": "2.6.0", "semver": ">=4.3.3", + "speedline": "0.2.2", "yargs": "3.30.0" }, "repository": "googlechrome/lighthouse",