From b577b67c25ff3727a0697b1faa837ee43b5b96b6 Mon Sep 17 00:00:00 2001
From: Justin Beckwith <justin.beckwith@gmail.com>
Date: Fri, 9 Nov 2018 12:42:15 -0800
Subject: [PATCH] refactor: drop a few deps (#105)

---
 packages/google-cloud-oslogin/package.json             | 10 +++-------
 packages/google-cloud-oslogin/synth.py                 |  8 ++------
 .../google-cloud-oslogin/system-test/.eslintrc.yml     |  1 -
 packages/google-cloud-oslogin/test/.eslintrc.yml       |  2 --
 4 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/packages/google-cloud-oslogin/package.json b/packages/google-cloud-oslogin/package.json
index 5dc4eec4baf8..acfbb49405bf 100644
--- a/packages/google-cloud-oslogin/package.json
+++ b/packages/google-cloud-oslogin/package.json
@@ -35,11 +35,10 @@
     "cover": "nyc --reporter=lcov mocha test/*.js && nyc report",
     "samples-test": "cd samples/ && npm link ../ && npm test && cd ../",
     "test-no-cover": "mocha 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 smoke-test/*.js",
+    "lint": "eslint '**/*.js'",
     "docs": "jsdoc -c .jsdoc.js",
     "system-test": "mocha system-test/*.js smoke-test/*.js --timeout 600000",
-    "fix": "eslint --fix '**/*.js' && npm run prettier"
+    "fix": "eslint --fix '**/*.js'"
   },
   "dependencies": {
     "google-gax": "^0.20.0",
@@ -47,20 +46,17 @@
   },
   "devDependencies": {
     "@google-cloud/nodejs-repo-tools": "^2.2.4",
-    "async": "^2.6.0",
     "codecov": "^3.0.0",
     "eslint": "^5.0.0",
     "eslint-config-prettier": "^3.0.0",
     "eslint-plugin-node": "^8.0.0",
     "eslint-plugin-prettier": "^3.0.0",
-    "extend": "^3.0.1",
     "ink-docstrap": "^1.3.2",
     "intelli-espower-loader": "^1.0.1",
     "jsdoc": "^3.5.5",
     "mocha": "^5.0.0",
     "nyc": "^13.0.0",
     "power-assert": "^1.4.4",
-    "prettier": "^1.9.2",
-    "through2": "^3.0.0"
+    "prettier": "^1.9.2"
   }
 }
diff --git a/packages/google-cloud-oslogin/synth.py b/packages/google-cloud-oslogin/synth.py
index 20c7a287ee83..12fbe65404a9 100644
--- a/packages/google-cloud-oslogin/synth.py
+++ b/packages/google-cloud-oslogin/synth.py
@@ -17,15 +17,12 @@
 import synthtool as s
 import synthtool.gcp as gcp
 import logging
-from pathlib import Path
 import subprocess
 
 logging.basicConfig(level=logging.DEBUG)
 
 gapic = gcp.GAPICGenerator()
-
 versions = ['v1beta']
-
 for version in versions:
     library = gapic.node_library(
         'os-login', version,
@@ -38,12 +35,11 @@
         excludes=['package.json', 'README.md', 'src/index.js'],
     )
 
+# Copy common templates
 common_templates = gcp.CommonTemplates()
 templates = common_templates.node_library()
 s.copy(templates)
 
-#
 # Node.js specific cleanup
-#
 subprocess.run(['npm', 'install'])
-subprocess.run(['npm', 'run', 'prettier'])
+subprocess.run(['npm', 'run', 'fix'])
diff --git a/packages/google-cloud-oslogin/system-test/.eslintrc.yml b/packages/google-cloud-oslogin/system-test/.eslintrc.yml
index 2e6882e46d23..f9605165c0fb 100644
--- a/packages/google-cloud-oslogin/system-test/.eslintrc.yml
+++ b/packages/google-cloud-oslogin/system-test/.eslintrc.yml
@@ -2,5 +2,4 @@
 env:
   mocha: true
 rules:
-  node/no-unpublished-require: off
   no-console: off
diff --git a/packages/google-cloud-oslogin/test/.eslintrc.yml b/packages/google-cloud-oslogin/test/.eslintrc.yml
index 73f7bbc946f9..6db2a46c5358 100644
--- a/packages/google-cloud-oslogin/test/.eslintrc.yml
+++ b/packages/google-cloud-oslogin/test/.eslintrc.yml
@@ -1,5 +1,3 @@
 ---
 env:
   mocha: true
-rules:
-  node/no-unpublished-require: off