build(docs-infra): upgrade all JS dependencies to latest versions (an…

…gular#36837)

This commit upgrades all dependencies in `scripts-js/` to latest
versions and also includes all necessary code changes to ensure the
tests are passing with the new dependency versions.

PR Close angular#36837

aio/aio-builds-setup/dockerbuild/scripts-js/lib/preview-server/utils.ts

@@ -1,5 +1,4 @@
 import * as express from 'express';
-import {promisify} from 'util';
 import {PreviewServerError} from './preview-error';
 
 /**
@@ -13,7 +12,7 @@ export async function respondWithError(res: express.Response, err: any): Promise
   }
 
   res.status(err.status);
-  await promisify(res.end.bind(res))(err.message);
+  return new Promise(resolve => res.end(err.message, resolve));
 }
 
 /**

aio/aio-builds-setup/dockerbuild/scripts-js/lib/verify-setup/helper.ts

@@ -93,7 +93,7 @@ class Helper {
     return fs.readFileSync(absFilePath, 'utf8');
   }
 
-  public runCmd(cmd: string, opts: cp.ExecFileOptions = {}): Promise<CmdResult> {
+  public runCmd(cmd: string, opts: cp.ExecOptions = {}): Promise<CmdResult> {
     return new Promise(resolve => {
       const proc = cp.exec(cmd, opts, (err, stdout, stderr) => resolve({success: !err, err, stdout, stderr}));
       this.createCleanUpFn(() => proc.kill());

aio/aio-builds-setup/dockerbuild/scripts-js/package.json

@@ -25,31 +25,31 @@
     "~~test-watch": "nodemon --delay 1 --exec \"yarn ~~test-only\" --watch dist"
   },
   "dependencies": {
-    "body-parser": "^1.18.3",
-    "delete-empty": "^2.0.0",
-    "express": "^4.16.3",
-    "jasmine": "^3.2.0",
-    "nock": "^9.6.1",
-    "node-fetch": "^2.2.0",
-    "shelljs": "^0.8.2",
-    "source-map-support": "^0.5.9",
-    "tar-stream": "^1.6.1",
-    "tslib": "^1.10.0"
+    "body-parser": "^1.19.0",
+    "delete-empty": "^3.0.0",
+    "express": "^4.17.1",
+    "jasmine": "^3.5.0",
+    "nock": "^12.0.3",
+    "node-fetch": "^2.6.0",
+    "shelljs": "^0.8.4",
+    "source-map-support": "^0.5.19",
+    "tar-stream": "^2.1.2",
+    "tslib": "^1.11.1"
   },
   "devDependencies": {
-    "@types/body-parser": "^1.17.0",
-    "@types/express": "^4.16.0",
-    "@types/jasmine": "^2.8.8",
-    "@types/nock": "^9.3.0",
-    "@types/node": "^10.9.2",
-    "@types/node-fetch": "^2.1.2",
-    "@types/shelljs": "^0.8.0",
-    "@types/supertest": "^2.0.5",
-    "nodemon": "^1.18.3",
+    "@types/body-parser": "^1.19.0",
+    "@types/express": "^4.17.6",
+    "@types/jasmine": "^3.5.10",
+    "@types/nock": "^11.1.0",
+    "@types/node": "^13.13.2",
+    "@types/node-fetch": "^2.5.7",
+    "@types/shelljs": "^0.8.7",
+    "@types/supertest": "^2.0.8",
+    "nodemon": "^2.0.3",
     "npm-run-all": "^4.1.5",
-    "supertest": "^3.1.0",
-    "tslint": "^5.11.0",
+    "supertest": "^4.0.2",
+    "tslint": "^6.1.1",
     "tslint-jasmine-noSkipOrFocus": "^1.0.9",
-    "typescript": "^3.0.1"
+    "typescript": "^3.8.3"
   }
 }

aio/aio-builds-setup/dockerbuild/scripts-js/test/clean-up/build-cleaner.spec.ts

@@ -187,7 +187,9 @@ describe('BuildCleaner', () => {
     let promise: Promise<number[]>;
 
     beforeEach(() => {
-      fsReaddirSpy = spyOn(fs, 'readdir').and.callFake((_: string, cb: typeof readdirCb) => readdirCb = cb);
+      fsReaddirSpy = spyOn(fs, 'readdir').and.callFake(
+        ((_: string, cb: typeof readdirCb) => readdirCb = cb) as unknown as typeof fs.readdir,
+      );
       promise = cleaner.getExistingBuildNumbers();
     });
 
@@ -304,7 +306,9 @@ describe('BuildCleaner', () => {
     let promise: Promise<string[]>;
 
     beforeEach(() => {
-      fsReaddirSpy = spyOn(fs, 'readdir').and.callFake((_: string, cb: typeof readdirCb) => readdirCb = cb);
+      fsReaddirSpy = spyOn(fs, 'readdir').and.callFake(
+        ((_: string, cb: typeof readdirCb) => readdirCb = cb) as unknown as typeof fs.readdir,
+      );
       promise = cleaner.getExistingDownloads();
     });
 

aio/aio-builds-setup/dockerbuild/scripts-js/test/common/github-api.spec.ts

@@ -217,7 +217,7 @@ describe('GithubApi', () => {
 
   describe('request()', () => {
     it('should return a promise', () => {
-      nock('https://api.github.com').get('').reply(200);
+      nock('https://api.github.com').get('/').reply(200);
       expect((api as any).request()).toEqual(jasmine.any(Promise));
     });
 

aio/aio-builds-setup/dockerbuild/scripts-js/test/common/github-pull-requests.spec.ts

@@ -1,6 +1,6 @@
 // Imports
 import {GithubApi} from '../../lib/common/github-api';
-import {GithubPullRequests} from '../../lib/common/github-pull-requests';
+import {GithubPullRequests, PullRequest} from '../../lib/common/github-pull-requests';
 
 // Tests
 describe('GithubPullRequests', () => {
@@ -47,7 +47,7 @@ describe('GithubPullRequests', () => {
 
 
     it('should make a POST request to Github with the correct pathname, params and data', () => {
-      githubApi.post.and.callFake(() => Promise.resolve());
+      githubApi.post.and.resolveTo();
       prs.addComment(42, 'body');
       expect(githubApi.post).toHaveBeenCalledWith('/repos/foo/bar/issues/42/comments', null, {body: 'body'});
     });
@@ -63,7 +63,7 @@ describe('GithubPullRequests', () => {
 
 
     it('should resolve with the data from the Github POST', done => {
-      githubApi.post.and.callFake(() => Promise.resolve('Test'));
+      githubApi.post.and.resolveTo('Test');
       prs.addComment(42, 'body').then(data => {
         expect(data).toBe('Test');
         done();
@@ -125,9 +125,14 @@ describe('GithubPullRequests', () => {
     });
 
 
-    it('should forward the value returned by \'getPaginated()\'', () => {
-      githubApi.getPaginated.and.returnValue('Test');
-      expect(prs.fetchAll() as any).toBe('Test');
+    it('should forward the value returned by \'getPaginated()\'', async () => {
+      const mockPrs: PullRequest[] = [
+        {number: 1, user: {login: 'foo'}, labels: []},
+        {number: 2, user: {login: 'bar'}, labels: []},
+      ];
+
+      githubApi.getPaginated.and.resolveTo(mockPrs);
+      expect(await prs.fetchAll()).toBe(mockPrs);
     });
 
   });

aio/aio-builds-setup/dockerbuild/scripts-js/test/common/github-teams.spec.ts

@@ -1,5 +1,5 @@
 import {GithubApi} from '../../lib/common/github-api';
-import {GithubTeams} from '../../lib/common/github-teams';
+import {GithubTeams, Team} from '../../lib/common/github-teams';
 
 // Tests
 describe('GithubTeams', () => {
@@ -33,9 +33,14 @@ describe('GithubTeams', () => {
     });
 
 
-    it('should forward the value returned by \'getPaginated()\'', () => {
-      githubApi.getPaginated.and.returnValue('Test');
-      expect(teams.fetchAll() as any).toBe('Test');
+    it('should forward the value returned by \'getPaginated()\'', async () => {
+      const mockTeams: Team[] = [
+        {id: 1, slug: 'foo'},
+        {id: 2, slug: 'bar'},
+      ];
+
+      githubApi.getPaginated.and.resolveTo(mockTeams);
+      expect(await teams.fetchAll()).toBe(mockTeams);
     });
 
   });
@@ -50,7 +55,7 @@ describe('GithubTeams', () => {
 
 
     it('should return a promise', () => {
-      githubApi.get.and.callFake(() => Promise.resolve());
+      githubApi.get.and.resolveTo();
       const promise = teams.isMemberById('user', [1]);
       expect(promise).toEqual(jasmine.any(Promise));
     });
@@ -66,7 +71,7 @@ describe('GithubTeams', () => {
 
 
     it('should call \'get()\' with the correct pathname', done => {
-      githubApi.get.and.callFake(() => Promise.resolve());
+      githubApi.get.and.resolveTo();
       teams.isMemberById('user', [1]).then(() => {
         expect(githubApi.get).toHaveBeenCalledWith('/teams/1/memberships/user');
         done();
@@ -85,7 +90,7 @@ describe('GithubTeams', () => {
 
 
     it('should resolve with false if the membership is not active', done => {
-      githubApi.get.and.callFake(() => Promise.resolve({state: 'pending'}));
+      githubApi.get.and.resolveTo({state: 'pending'});
       teams.isMemberById('user', [1]).then(isMember => {
         expect(isMember).toBe(false);
         expect(githubApi.get).toHaveBeenCalled();
@@ -95,7 +100,7 @@ describe('GithubTeams', () => {
 
 
     it('should resolve with true if the membership is active', done => {
-      githubApi.get.and.callFake(() => Promise.resolve({state: 'active'}));
+      githubApi.get.and.resolveTo({state: 'active'});
       teams.isMemberById('user', [1]).then(isMember => {
         expect(isMember).toBe(true);
         done();
@@ -104,7 +109,7 @@ describe('GithubTeams', () => {
 
 
     it('should sequentially call \'get()\' until an active membership is found', done => {
-      const trainedResponses: {[pathname: string]: Promise<{state: string}>} = {
+      const trainedResponses: {[pathname: string]: Promise<any>} = {
         '/teams/1/memberships/user': Promise.resolve({state: 'pending'}),
         '/teams/2/memberships/user': Promise.reject(null),
         '/teams/3/memberships/user': Promise.resolve({state: 'active'}),
@@ -125,7 +130,7 @@ describe('GithubTeams', () => {
 
 
     it('should resolve with false if no active membership is found', done => {
-      const trainedResponses: {[pathname: string]: Promise<{state: string}>} = {
+      const trainedResponses: {[pathname: string]: Promise<any>} = {
         '/teams/1/memberships/user': Promise.resolve({state: 'pending'}),
         '/teams/2/memberships/user':  Promise.reject(null),
         '/teams/3/memberships/user': Promise.resolve({state: 'not active'}),

aio/aio-builds-setup/dockerbuild/scripts-js/test/preview-server/build-creator.spec.ts

@@ -443,7 +443,9 @@ describe('BuildCreator', () => {
 
     beforeEach(() => {
       fsAccessCbs = [];
-      fsAccessSpy = spyOn(fs, 'access').and.callFake((_: string, cb: (v?: any) => void) => fsAccessCbs.push(cb));
+      fsAccessSpy = spyOn(fs, 'access').and.callFake(
+        ((_: string, cb: (v?: any) => void) => fsAccessCbs.push(cb)) as unknown as typeof fs.access,
+      );
     });
 
 
@@ -495,7 +497,10 @@ describe('BuildCreator', () => {
       consoleWarnSpy = spyOn(Logger.prototype, 'warn');
       shellChmodSpy = spyOn(shell, 'chmod');
       shellRmSpy = spyOn(shell, 'rm');
-      cpExecSpy = spyOn(cp, 'exec').and.callFake((_: string, cb: (...args: any[]) => void) => cpExecCbs.push(cb));
+      cpExecSpy = spyOn(cp, 'exec').and.callFake(
+        ((_: string, cb: (...args: any[]) => void) =>
+          cpExecCbs.push(cb)) as unknown as typeof cp.exec,
+      );
     });
 
 
@@ -600,7 +605,7 @@ describe('BuildCreator', () => {
     });
 
     beforeEach(() => {
-      shellLsSpy = spyOn(shell, 'ls').and.returnValue([]);
+      shellLsSpy = spyOn(shell, 'ls').and.returnValue([] as unknown as shell.ShellArray);
     });
 
 

aio/aio-builds-setup/dockerbuild/scripts-js/test/preview-server/build-retriever.spec.ts

@@ -38,12 +38,13 @@ describe('BuildRetriever', () => {
 
     WRITEFILE_RESULT = undefined;
     writeFileSpy = spyOn(fs, 'writeFile').and.callFake(
-      (_path: string, _buffer: Buffer, callback: (err?: any) => {}) => callback(WRITEFILE_RESULT),
+      ((_path: string, _buffer: Buffer, callback: fs.NoParamCallback) =>
+        callback(WRITEFILE_RESULT)) as typeof fs.writeFile,
     );
 
     EXISTS_RESULT = false;
     existsSpy = spyOn(fs, 'exists').and.callFake(
-      (_path: string, callback: (exists: boolean) => {}) => callback(EXISTS_RESULT),
+      ((_path, callback) => callback(EXISTS_RESULT)) as typeof fs.exists,
     );
   });
 

aio/aio-builds-setup/dockerbuild/scripts-js/test/preview-server/build-verifier.spec.ts

@@ -51,7 +51,10 @@ describe('BuildVerifier', () => {
   describe('getSignificantFilesChanged', () => {
     it('should return false if none of the fetched files match the given pattern', async () => {
       const fetchFilesSpy = spyOn(prs, 'fetchFiles');
-      fetchFilesSpy.and.callFake(() => Promise.resolve([{filename: 'a/b/c'}, {filename: 'd/e/f'}]));
+      fetchFilesSpy.and.callFake(() => Promise.resolve([
+        {filename: 'a/b/c', sha: 'a1'},
+        {filename: 'd/e/f', sha: 'b2'},
+      ]));
       expect(await bv.getSignificantFilesChanged(777, /^x/)).toEqual(false);
       expect(fetchFilesSpy).toHaveBeenCalledWith(777);
 

aio/aio-builds-setup/dockerbuild/scripts-js/test/preview-server/preview-server-factory.spec.ts

@@ -1,5 +1,4 @@
 // Imports
-import * as express from 'express';
 import * as http from 'http';
 import * as supertest from 'supertest';
 import {CircleCiApi} from '../../lib/common/circle-ci-api';
@@ -134,7 +133,7 @@ describe('PreviewServerFactory', () => {
       const buildCreator = jasmine.any(BuildCreator);
       expect(usfCreateMiddlewareSpy).toHaveBeenCalledWith(buildRetriever, buildVerifier, buildCreator, defaultConfig);
 
-      const middleware: express.Express = usfCreateMiddlewareSpy.calls.mostRecent().returnValue;
+      const middleware = usfCreateMiddlewareSpy.calls.mostRecent().returnValue;
       expect(httpCreateServerSpy).toHaveBeenCalledWith(middleware);
     });