From 4194797acc6ebc36df34c579f345c890b2f0ddcb Mon Sep 17 00:00:00 2001 From: Justin Beckwith Date: Mon, 25 Jun 2018 18:20:55 -0700 Subject: [PATCH] refactor: drop repo-tool as an exec wrapper (#107) --- .circleci/config.yml | 1 - package.json | 10 +++++----- samples/package.json | 2 +- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index bb7ed944..b0833e47 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -80,7 +80,6 @@ jobs: command: |- mkdir -p /home/node/.npm-global npm install - chmod +x node_modules/@google-cloud/nodejs-repo-tools/bin/tools environment: NPM_CONFIG_PREFIX: /home/node/.npm-global - run: diff --git a/package.json b/package.json index b15248b4..e1b6a81d 100644 --- a/package.json +++ b/package.json @@ -54,15 +54,15 @@ "pnr " ], "scripts": { - "docs": "repo-tools exec -- jsdoc -c .jsdoc.js", + "docs": "jsdoc -c .jsdoc.js", "generate-scaffolding": "repo-tools generate all --except lib_readme", - "lint": "repo-tools lint --cmd eslint -- src/ samples/ system-test/ test/", - "prettier": "repo-tools exec -- prettier --write src/*.js src/*/*.js samples/*.js samples/*/*.js test/*.js test/*/*.js system-test/*.js system-test/*/*.js", + "lint": "eslint src/ samples/ system-test/ test/", + "prettier": "prettier --write src/*.js src/*/*.js samples/*.js samples/*/*.js test/*.js test/*/*.js system-test/*.js system-test/*/*.js", "presamples-test": "npm run compile", "samples-test": "cd samples/ && npm link ../ && npm test && cd ../", "presystem-test": "npm run compile", - "system-test": "repo-tools test run --cmd mocha -- build/system-test/*.js --timeout 600000 -r source-map-support/register", - "test": "repo-tools test run --cmd mocha -- build/test/*.js -r source-map-support/register", + "system-test": "mocha build/system-test/*.js --timeout 600000 -r source-map-support/register", + "test": "mocha build/test/*.js -r source-map-support/register", "check": "gts check", "clean": "gts clean", "compile": "tsc -p .", diff --git a/samples/package.json b/samples/package.json index 9ccd59d8..f09292b4 100644 --- a/samples/package.json +++ b/samples/package.json @@ -10,7 +10,7 @@ }, "scripts": { "system-test": "ava -T 1m --verbose system-test/*.test.js", - "test": "repo-tools test run --cmd npm -- run system-test" + "test": "npm run system-test" }, "dependencies": { "@google-cloud/logging-winston": "0.9.0",