Merge branch 'master' into renovate-template-supertest-6.x

src/cli/configure/upgrade/patches/7.3.1/addEmptyExports.test.ts

@@ -1,4 +1,4 @@
-import fs from 'fs';
+import fs from 'fs-extra';
 
 import * as packageAnalysis from '../../../analysis/package';
 import * as projectAnalysis from '../../../analysis/project';

src/cli/lint.int.test.ts

@@ -1,10 +1,9 @@
 import crypto from 'crypto';
-import fs from 'fs';
 import path from 'path';
 import stream from 'stream';
 import { inspect } from 'util';
 
-import { copy } from 'fs-extra';
+import fs, { copy } from 'fs-extra';
 import git from 'isomorphic-git';
 
 import { Buildkite } from '..';