build!: upgrade to gts@2 (#2062)

Author: JustinBeckwith

.eslintrc.yml

@@ -22,18 +22,13 @@ module.exports = {
     template: './node_modules/jsdoc-fresh',
     recurse: true,
     verbose: true,
-    destination: './docs/'
+    destination: './docs/',
   },
-  plugins: [
-    'plugins/markdown',
-    'jsdoc-region-tag'
-  ],
+  plugins: ['plugins/markdown', 'jsdoc-region-tag'],
   source: {
     excludePattern: '(^|\\/|\\\\)[._]',
-    include: [
-      'src',
-    ],
-    includePattern: '\\.js$'
+    include: ['src'],
+    includePattern: '\\.js$',
   },
   templates: {
     copyright: 'Copyright 2019 Google, LLC.',
@@ -42,10 +37,10 @@ module.exports = {
     systemName: 'googleapis',
     theme: 'lumen',
     default: {
-      outputSourceFiles: false
-    }
+      outputSourceFiles: false,
+    },
   },
   markdown: {
-    idInHeadings: true
-  }
+    idInHeadings: true,
+  },
 };

.jsdoc.js

@@ -12,10 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 const config = {
-  "enable-source-maps": true,
-  "throw-deprecation": true,
-  "timeout": 10000
-}
+  'enable-source-maps': true,
+  'throw-deprecation': true,
+  timeout: 10000,
+};
 if (process.env.MOCHA_THROW_DEPRECATION === 'false') {
   delete config['throw-deprecation'];
 }
@@ -25,4 +25,4 @@ if (process.env.MOCHA_REPORTER) {
 if (process.env.MOCHA_REPORTER_OUTPUT) {
   config['reporter-option'] = `output=${process.env.MOCHA_REPORTER_OUTPUT}`;
 }
-module.exports = config
+module.exports = config;

.mocharc.js

@@ -13,5 +13,5 @@
 // limitations under the License.
 
 module.exports = {
-  ...require('gts/.prettierrc.json')
-}
+  ...require('gts/.prettierrc.json'),
+};

.prettierrc

@@ -1,16 +1,18 @@
 {
+  "name": "googleapis",
+  "version": "49.0.0",
+  "repository": "googleapis/google-api-nodejs-client",
   "license": "Apache-2.0",
-  "dependencies": {
-    "google-auth-library": "^6.0.0",
-    "googleapis-common": "^4.0.0"
+  "description": "Google APIs Client Library for Node.js",
+  "main": "./build/src/index.js",
+  "types": "./build/src/index.d.ts",
+  "engines": {
+    "node": ">=10"
   },
   "files": [
     "build/src",
     "!build/src/**/*.map"
   ],
-  "repository": "googleapis/google-api-nodejs-client",
-  "name": "googleapis",
-  "version": "49.0.0",
   "scripts": {
     "pretest": "npm run compile",
     "prepare": "npm run compile",
@@ -19,11 +21,11 @@
     "docs": "node build/src/generator/docs",
     "system-test": "mocha build/system-test",
     "samples-test": "cd samples && npm link ../ && pwd && npm test",
-    "lint": "gts check && eslint 'samples/**/*.js'",
+    "lint": "gts check",
     "compile": "tsc -p .",
     "build-tools": "tsc -p tsconfig.tools.json",
     "clean": "gts clean",
-    "fix": "eslint --fix '**/*.js' && gts fix",
+    "fix": "gts fix",
     "pregenerate": "npm run build-tools",
     "generate": "node build/src/generator/generate.js",
     "postgenerate": "npm run fix",
@@ -40,15 +42,12 @@
     "client",
     "client library"
   ],
-  "description": "Google APIs Client Library for Node.js",
-  "main": "./build/src/index.js",
-  "types": "./build/src/index.d.ts",
-  "engines": {
-    "node": ">=10"
+  "dependencies": {
+    "google-auth-library": "^6.0.0",
+    "googleapis-common": "^4.1.0"
   },
   "devDependencies": {
     "@compodoc/compodoc": "^1.1.10",
-    "@types/chai": "^4.1.7",
     "@types/execa": "^0.9.0",
     "@types/minimist": "^1.2.0",
     "@types/mkdirp": "^1.0.0",
@@ -61,16 +60,11 @@
     "@types/rimraf": "^3.0.0",
     "@types/tmp": "^0.1.0",
     "@types/url-template": "^2.0.28",
-    "assert-rejects": "^1.0.0",
     "c8": "^7.0.0",
-    "chai": "^4.2.0",
     "codecov": "^3.4.0",
-    "eslint": "^6.0.0",
-    "eslint-config-prettier": "^6.0.0",
-    "eslint-plugin-node": "^11.0.0",
-    "eslint-plugin-prettier": "^3.1.0",
     "execa": "^4.0.0",
-    "gts": "^1.1.0",
+    "gaxios": "^3.0.3",
+    "gts": "^2.0.0",
     "js-green-licenses": "^1.0.0",
     "linkinator": "^2.0.0",
     "minimist": "^1.2.5",
@@ -85,6 +79,6 @@
     "rimraf": "^3.0.0",
     "server-destroy": "^1.0.1",
     "tmp": "^0.2.0",
-    "typescript": "3.6.4"
+    "typescript": "^3.8.3"
   }
 }

.prettierrc.js

@@ -53,10 +53,7 @@ async function runSample() {
 // if invoked directly (not tests), authenticate and run the samples
 if (module === require.main) {
   const scopes = ['https://www.googleapis.com/auth/analytics'];
-  sampleClient
-    .authenticate(scopes)
-    .then(runSample)
-    .catch(console.error);
+  sampleClient.authenticate(scopes).then(runSample).catch(console.error);
 }
 
 // export functions for testing purposes

package.json

@@ -19,10 +19,7 @@ const nconf = require('nconf');
 const path = require('path');
 
 // Ex: node blogger.js --api_key "YOUR API KEY"
-nconf
-  .argv()
-  .env()
-  .file(path.join(__dirname, 'config.json'));
+nconf.argv().env().file(path.join(__dirname, 'config.json'));
 
 blogger.blogs.get(
   {

samples/analyticsReporting/batchGet.js

@@ -36,10 +36,7 @@ async function runSample() {
 
 if (module === require.main) {
   const scopes = ['https://www.googleapis.com/auth/blogger'];
-  sampleClient
-    .authenticate(scopes)
-    .then(runSample)
-    .catch(console.error);
+  sampleClient.authenticate(scopes).then(runSample).catch(console.error);
 }
 
 module.exports = {

samples/blogger/blogger.js

@@ -46,10 +46,7 @@ async function runSample() {
 // if invoked directly (not tests), authenticate and run the samples
 if (module === require.main) {
   const scopes = ['https://www.googleapis.com/auth/drive.readonly'];
-  sampleClient
-    .authenticate(scopes)
-    .then(runSample)
-    .catch(console.error);
+  sampleClient.authenticate(scopes).then(runSample).catch(console.error);
 }
 
 // export functions for testing purposes

samples/blogger/insert.js

@@ -31,10 +31,7 @@ async function runSample(query) {
 
 if (module === require.main) {
   const scopes = ['https://www.googleapis.com/auth/drive.metadata.readonly'];
-  sampleClient
-    .authenticate(scopes)
-    .then(runSample)
-    .catch(console.error);
+  sampleClient.authenticate(scopes).then(runSample).catch(console.error);
 }
 
 module.exports = {

samples/drive/export.js

@@ -29,10 +29,7 @@ async function runSample() {
 
 if (module === require.main) {
   const scopes = ['https://www.googleapis.com/auth/gmail.readonly'];
-  sampleClient
-    .authenticate(scopes)
-    .then(runSample)
-    .catch(console.error);
+  sampleClient.authenticate(scopes).then(runSample).catch(console.error);
 }
 
 module.exports = {

samples/drive/list.js

@@ -63,10 +63,7 @@ const scopes = [
 ];
 
 if (module === require.main) {
-  sampleClient
-    .authenticate(scopes)
-    .then(runSample)
-    .catch(console.error);
+  sampleClient.authenticate(scopes).then(runSample).catch(console.error);
 }
 
 module.exports = {

samples/gmail/list.js

@@ -35,7 +35,7 @@ async function runSample() {
     userId: 'me',
     requestBody: {
       // Replace with `projects/${PROJECT_ID}/topics/${TOPIC_NAME}`
-      topicName: `projects/el-gato/topics/gmail`,
+      topicName: 'projects/el-gato/topics/gmail',
     },
   });
   console.log(res.data);
@@ -50,10 +50,7 @@ const scopes = [
 ];
 
 if (module === require.main) {
-  sampleClient
-    .authenticate(scopes)
-    .then(runSample)
-    .catch(console.error);
+  sampleClient.authenticate(scopes).then(runSample).catch(console.error);
 }
 
 module.exports = {

samples/gmail/send.js

@@ -41,10 +41,7 @@ if (module === require.main) {
     'https://www.googleapis.com/auth/jobs',
     'https://www.googleapis.com/auth/cloud-platform',
   ];
-  sampleClient
-    .authenticate(scopes)
-    .then(runSample)
-    .catch(console.error);
+  sampleClient.authenticate(scopes).then(runSample).catch(console.error);
 }
 
 module.exports = {

samples/gmail/watch.js

@@ -33,7 +33,4 @@ const scopes = [
   'https://www.googleapis.com/auth/glass.location',
 ];
 
-sampleClient
-  .authenticate(scopes)
-  .then(runSample)
-  .catch(console.error);
+sampleClient.authenticate(scopes).then(runSample).catch(console.error);

samples/jobs/jobs.js

@@ -19,10 +19,7 @@ const plus = google.plus('v1');
 const nconf = require('nconf');
 const path = require('path');
 
-nconf
-  .argv()
-  .env()
-  .file(path.join(__dirname, 'config.json'));
+nconf.argv().env().file(path.join(__dirname, 'config.json'));
 
 // PUT your API key here or this example will return errors
 // To learn more about API keys, please see:

samples/mirror/mirror.js

@@ -61,8 +61,5 @@ async function runSample() {
 const scopes = ['https://www.googleapis.com/auth/contacts'];
 
 if (module === require.main) {
-  sampleClient
-    .authenticate(scopes)
-    .then(runSample)
-    .catch(console.error);
+  sampleClient.authenticate(scopes).then(runSample).catch(console.error);
 }

samples/multiple.js

@@ -37,8 +37,5 @@ const scopes = [
 ];
 
 if (module === require.main) {
-  sampleClient
-    .authenticate(scopes)
-    .then(runSample)
-    .catch(console.error);
+  sampleClient.authenticate(scopes).then(runSample).catch(console.error);
 }

samples/people/contacts.js

@@ -1,4 +1,4 @@
-// Copyright 2019, Google, LLC.
+// Copyright 2019 Google, LLC
 // 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
@@ -13,13 +13,13 @@
 
 'use strict';
 
-const {assert} = require('chai');
+const assert = require('assert');
 const execa = require('execa');
 const {describe, it} = require('mocha');
 
 describe('Compute samples', () => {
   it('should list all the VMs', async () => {
     const res = execa.sync('node compute/listVMs.js', {shell: true});
-    assert.match(res.stdout, /VMs:/);
+    assert.ok(/VMs:/.test(res.stdout));
   });
 });

samples/people/me.js

@@ -37,9 +37,7 @@ describe('analyticsReporting samples', () => {
   });
 
   it('should batchGet', async () => {
-    const scope = nock(baseUrl)
-      .post(`/v4/reports:batchGet`)
-      .reply(200, {});
+    const scope = nock(baseUrl).post('/v4/reports:batchGet').reply(200, {});
     const data = await samples.batchGet.runSample();
     assert(data);
     scope.done();

samples/test/test.compute.samples.js

@@ -38,7 +38,7 @@ describe('blogger samples', () => {
 
   it('should insert a blog post', async () => {
     const scope = nock(baseUrl)
-      .post(`/v3/blogs/4340475495955554224/posts`)
+      .post('/v3/blogs/4340475495955554224/posts')
       .reply(200, {});
     const data = await samples.post.runSample();
     assert(data);

samples/test/test.samples.analyticsReporting.js

@@ -32,7 +32,7 @@ describe('customsearch samples', () => {
 
   it('should search', async () => {
     const scope = nock(baseUrl)
-      .get(`/customsearch/v1?cx=cx&q=q`)
+      .get('/customsearch/v1?cx=cx&q=q')
       .reply(200, {});
     const options = {cx: 'cx', q: 'q', auth: 'key'};
     const data = await samples.list.runSample(options);