revert all the import type changes

yarnpkg · Jun 4, 2021 · 508a322 · 508a322
1 parent f3f8041
commit 508a322
Show file tree

Hide file tree

Showing 141 changed files with 268 additions and 268 deletions.
diff --git a/packages/acceptance-tests/pkg-tests-core/sources/utils/fs.ts b/packages/acceptance-tests/pkg-tests-core/sources/utils/fs.ts
@@ -3,7 +3,7 @@ import {stringifySyml, parseSyml}                  from '@yarnpkg/parsers';
 import klaw                                        from 'klaw';
 import tarFs                                       from 'tar-fs';
 import zlib                                        from 'zlib';
-import type {Gzip}                                 from 'zlib';
+import {Gzip}                                 from 'zlib';
 
 import * as miscUtils                              from './misc';
 

diff --git a/packages/acceptance-tests/pkg-tests-core/sources/utils/makeTemporaryMonorepoEnv.ts b/packages/acceptance-tests/pkg-tests-core/sources/utils/makeTemporaryMonorepoEnv.ts
@@ -1,7 +1,7 @@
 import {PortablePath, ppath, Filename} from '@yarnpkg/fslib';
 
 import * as fsUtils                    from './fs';
-import type {RunFunction}              from './tests';
+import {RunFunction}              from './tests';
 
 const deepResolve = require(`super-resolve`);
 

diff --git a/packages/acceptance-tests/pkg-tests-core/sources/utils/tests.ts b/packages/acceptance-tests/pkg-tests-core/sources/utils/tests.ts
@@ -3,9 +3,9 @@ import crypto                            from 'crypto';
 import finalhandler                      from 'finalhandler';
 import https                             from 'https';
 import http                              from 'http';
-import type {IncomingMessage, ServerResponse} from 'http';
+import {IncomingMessage, ServerResponse} from 'http';
 import invariant                         from 'invariant';
-import type {AddressInfo}                     from 'net';
+import {AddressInfo}                     from 'net';
 import pem                               from 'pem';
 import semver                            from 'semver';
 import serveStatic                       from 'serve-static';
@@ -15,9 +15,9 @@ const deepResolve = require(`super-resolve`);
 
 const staticServer = serveStatic(npath.fromPortablePath(require(`pkg-tests-fixtures`)));
 
-import type {Gzip}       from 'zlib';
+import {Gzip}       from 'zlib';
 
-import type {ExecResult} from './exec';
+import {ExecResult} from './exec';
 import * as fsUtils      from './fs';
 
 export type PackageEntry = Map<string, {path: string, packageJson: Object}>;

diff --git a/packages/acceptance-tests/pkg-tests-specs/sources/plugins/plugin-typescript.test.ts b/packages/acceptance-tests/pkg-tests-specs/sources/plugins/plugin-typescript.test.ts
@@ -1,5 +1,5 @@
 import {Manifest}          from '@yarnpkg/core';
-import type {PortablePath} from '@yarnpkg/fslib';
+import {PortablePath} from '@yarnpkg/fslib';
 import {merge}             from 'lodash';
 import {fs, yarn}          from 'pkg-tests-core';
 

diff --git a/packages/acceptance-tests/pkg-tests-specs/sources/protocols/workspace.test.ts b/packages/acceptance-tests/pkg-tests-specs/sources/protocols/workspace.test.ts
@@ -1,4 +1,4 @@
-import type {PortablePath} from '@yarnpkg/fslib';
+import {PortablePath} from '@yarnpkg/fslib';
 import {fs}                from 'pkg-tests-core';
 
 const {writeJson} = fs;

diff --git a/packages/acceptance-tests/pkg-tests-specs/sources/workspace.test.ts b/packages/acceptance-tests/pkg-tests-specs/sources/workspace.test.ts
@@ -1,5 +1,5 @@
-import type {PortablePath} from '@yarnpkg/fslib';
-import type {exec}         from 'pkg-tests-core';
+import {PortablePath} from '@yarnpkg/fslib';
+import {exec}         from 'pkg-tests-core';
 import {fs}                from 'pkg-tests-core';
 
 const {readFile, writeFile, writeJson} = fs;

diff --git a/packages/esbuild-plugin-pnp/sources/index.ts b/packages/esbuild-plugin-pnp/sources/index.ts
@@ -1,5 +1,5 @@
 import {PnpApi}                                                                             from '@yarnpkg/pnp';
-import type {OnLoadArgs, OnLoadResult, OnResolveArgs, OnResolveResult, Plugin, PluginBuild} from 'esbuild';
+import {OnLoadArgs, OnLoadResult, OnResolveArgs, OnResolveResult, Plugin, PluginBuild} from 'esbuild';
 import * as fs                                                                              from 'fs';
 
 const matchAll = /()/;

diff --git a/packages/plugin-compat/sources/extensions.ts b/packages/plugin-compat/sources/extensions.ts
@@ -2,7 +2,7 @@
 // the same fields as you add here and prefix your changes with the relevant
 // PR url.
 
-import type {PackageExtensionData} from '@yarnpkg/core';
+import {PackageExtensionData} from '@yarnpkg/core';
 
 const optionalPeerDep = {
   optional: true,

diff --git a/packages/plugin-compat/sources/index.ts b/packages/plugin-compat/sources/index.ts
@@ -1,5 +1,5 @@
 import {Hooks as CoreHooks, Plugin, structUtils} from '@yarnpkg/core';
-import type {Hooks as PatchHooks}                from '@yarnpkg/plugin-patch';
+import {Hooks as PatchHooks}                from '@yarnpkg/plugin-patch';
 
 import {packageExtensions}                       from './extensions';
 import {getPatch as getFseventsPatch}            from './patches/fsevents.patch';

diff --git a/packages/plugin-constraints/sources/index.ts b/packages/plugin-constraints/sources/index.ts
@@ -1,5 +1,5 @@
 import {Plugin, SettingsType} from '@yarnpkg/core';
-import type {PortablePath}    from '@yarnpkg/fslib';
+import {PortablePath}    from '@yarnpkg/fslib';
 
 import queryConstraints       from './commands/constraints/query';
 import sourceConstraints      from './commands/constraints/source';

diff --git a/packages/plugin-constraints/sources/tauModule.ts b/packages/plugin-constraints/sources/tauModule.ts
@@ -1,7 +1,7 @@
 /// <reference path="./tauProlog.d.ts"/>
 
 import {Project, structUtils} from '@yarnpkg/core';
-import type {PortablePath}    from '@yarnpkg/fslib';
+import {PortablePath}    from '@yarnpkg/fslib';
 import getPath                from 'lodash/get';
 import pl                     from 'tau-prolog';
 import vm                     from 'vm';

diff --git a/packages/plugin-dlx/sources/index.ts b/packages/plugin-dlx/sources/index.ts
@@ -1,4 +1,4 @@
-import type {Plugin} from '@yarnpkg/core';
+import {Plugin} from '@yarnpkg/core';
 
 import create        from './commands/create';
 import dlx           from './commands/dlx';

diff --git a/packages/plugin-essentials/sources/commands/add.ts b/packages/plugin-essentials/sources/commands/add.ts
@@ -2,12 +2,12 @@ import {BaseCommand, WorkspaceRequiredError}                        from '@yarnp
 import {Cache, Configuration, Descriptor, LightReport, MessageName} from '@yarnpkg/core';
 import {Project, StreamReport, Workspace, Ident}                    from '@yarnpkg/core';
 import {structUtils}                                                from '@yarnpkg/core';
-import type {PortablePath}                                               from '@yarnpkg/fslib';
+import {PortablePath}                                               from '@yarnpkg/fslib';
 import {Command, Option, Usage, UsageError}                         from 'clipanion';
 import {prompt}                                                     from 'enquirer';
 
 import * as suggestUtils                                            from '../suggestUtils';
-import type {Hooks}                                                 from '..';
+import {Hooks}                                                 from '..';
 
 // eslint-disable-next-line arca/no-default-export
 export default class AddCommand extends BaseCommand {

diff --git a/packages/plugin-essentials/sources/commands/entries/help.ts b/packages/plugin-essentials/sources/commands/entries/help.ts
@@ -1,4 +1,4 @@
-import type {CommandContext} from '@yarnpkg/core';
+import {CommandContext} from '@yarnpkg/core';
 import {Command}             from 'clipanion';
 
 // eslint-disable-next-line arca/no-default-export

diff --git a/packages/plugin-essentials/sources/commands/explain/peerRequirements.ts b/packages/plugin-essentials/sources/commands/explain/peerRequirements.ts
@@ -1,7 +1,7 @@
 import {BaseCommand}                                                                                                          from '@yarnpkg/cli';
 import {Configuration, MessageName, miscUtils, Project, StreamReport, structUtils, semverUtils, formatUtils, PeerRequirement} from '@yarnpkg/core';
 import {Command, Option}                                                                                                      from 'clipanion';
-import type {Writable}                                                                                                             from 'stream';
+import {Writable}                                                                                                             from 'stream';
 import * as t                                                                                                                 from 'typanion';
 
 // eslint-disable-next-line arca/no-default-export

diff --git a/packages/plugin-essentials/sources/commands/info.ts b/packages/plugin-essentials/sources/commands/info.ts
@@ -4,7 +4,7 @@ import {xfs}
 import {Command, Option, Usage, UsageError}                                                                                                                           from 'clipanion';
 import mm                                                                                                                                                             from 'micromatch';
 
-import type {Hooks}                                                                                                                                                   from '..';
+import {Hooks}                                                                                                                                                   from '..';
 
 // eslint-disable-next-line arca/no-default-export
 export default class InfoCommand extends BaseCommand {

diff --git a/packages/plugin-essentials/sources/commands/remove.ts b/packages/plugin-essentials/sources/commands/remove.ts
@@ -6,7 +6,7 @@ import {Command, Option, Usage, UsageError}                                 from
 import micromatch                                                           from 'micromatch';
 
 import * as suggestUtils                                                    from '../suggestUtils';
-import type {Hooks}                                                         from '..';
+import {Hooks}                                                         from '..';
 
 // eslint-disable-next-line arca/no-default-export
 export default class RemoveCommand extends BaseCommand {

diff --git a/packages/plugin-essentials/sources/commands/up.ts b/packages/plugin-essentials/sources/commands/up.ts
@@ -8,7 +8,7 @@ import micromatch
 import * as t                                                                                                       from 'typanion';
 
 import * as suggestUtils                                                                                            from '../suggestUtils';
-import type {Hooks}                                                                                                 from '..';
+import {Hooks}                                                                                                 from '..';
 
 // eslint-disable-next-line arca/no-default-export
 export default class UpCommand extends BaseCommand {

diff --git a/packages/plugin-essentials/sources/index.ts b/packages/plugin-essentials/sources/index.ts
@@ -1,5 +1,6 @@
+//ts-node-dump
 import {Descriptor, Plugin, SettingsType, Package, formatUtils} from '@yarnpkg/core';
-import type {Workspace}                                         from '@yarnpkg/core';
+import {Workspace}                                         from '@yarnpkg/core';
 import {isCI}                                                   from 'ci-info';
 
 import add                                                      from './commands/add';

diff --git a/packages/plugin-exec/sources/ExecFetcher.ts b/packages/plugin-exec/sources/ExecFetcher.ts
@@ -1,6 +1,6 @@
 import {execUtils, scriptUtils, structUtils, tgzUtils}         from '@yarnpkg/core';
-import type {Locator}                                          from '@yarnpkg/core';
-import type {Fetcher, FetchOptions, MinimalFetchOptions}       from '@yarnpkg/core';
+import {Locator}                                          from '@yarnpkg/core';
+import {Fetcher, FetchOptions, MinimalFetchOptions}       from '@yarnpkg/core';
 import {Filename, PortablePath, npath, ppath, xfs, NativePath} from '@yarnpkg/fslib';
 
 import {PROTOCOL}                                              from './constants';

diff --git a/packages/plugin-exec/sources/ExecResolver.ts b/packages/plugin-exec/sources/ExecResolver.ts
@@ -1,4 +1,4 @@
-import type {Resolver, ResolveOptions, MinimalResolveOptions}   from '@yarnpkg/core';
+import {Resolver, ResolveOptions, MinimalResolveOptions}   from '@yarnpkg/core';
 import {Descriptor, Locator, Manifest, DescriptorHash, Package} from '@yarnpkg/core';
 import {LinkType}                                               from '@yarnpkg/core';
 import {miscUtils, structUtils, hashUtils}                      from '@yarnpkg/core';

diff --git a/packages/plugin-exec/sources/index.ts b/packages/plugin-exec/sources/index.ts
@@ -1,4 +1,4 @@
-import type {Plugin}          from '@yarnpkg/core';
+import {Plugin}          from '@yarnpkg/core';
 
 import {ExecFetcher, ExecEnv} from './ExecFetcher';
 import {ExecResolver}         from './ExecResolver';

diff --git a/packages/plugin-file/sources/FileFetcher.ts b/packages/plugin-file/sources/FileFetcher.ts
@@ -1,6 +1,6 @@
 import {structUtils}                                     from '@yarnpkg/core';
-import type {Locator}                                    from '@yarnpkg/core';
-import type {Fetcher, FetchOptions, MinimalFetchOptions} from '@yarnpkg/core';
+import {Locator}                                    from '@yarnpkg/core';
+import {Fetcher, FetchOptions, MinimalFetchOptions} from '@yarnpkg/core';
 import {ppath}                                           from '@yarnpkg/fslib';
 
 import {PROTOCOL}                                        from './constants';

diff --git a/packages/plugin-file/sources/FileResolver.ts b/packages/plugin-file/sources/FileResolver.ts
@@ -1,7 +1,7 @@
 import {miscUtils, structUtils, hashUtils}                    from '@yarnpkg/core';
 import {LinkType}                                             from '@yarnpkg/core';
 import {Descriptor, Locator, Manifest}                        from '@yarnpkg/core';
-import type {Resolver, ResolveOptions, MinimalResolveOptions} from '@yarnpkg/core';
+import {Resolver, ResolveOptions, MinimalResolveOptions} from '@yarnpkg/core';
 
 import {FILE_REGEXP, PROTOCOL}                                from './constants';
 import * as fileUtils                                         from './fileUtils';

diff --git a/packages/plugin-file/sources/TarballFileFetcher.ts b/packages/plugin-file/sources/TarballFileFetcher.ts
@@ -1,5 +1,5 @@
-import type {Fetcher, FetchOptions, FetchResult, MinimalFetchOptions} from '@yarnpkg/core';
-import type {Locator}                                                 from '@yarnpkg/core';
+import {Fetcher, FetchOptions, FetchResult, MinimalFetchOptions} from '@yarnpkg/core';
+import {Locator}                                                 from '@yarnpkg/core';
 import {miscUtils, structUtils, tgzUtils}                        from '@yarnpkg/core';
 import {PortablePath, ppath, CwdFS}                              from '@yarnpkg/fslib';
 

diff --git a/packages/plugin-file/sources/TarballFileResolver.ts b/packages/plugin-file/sources/TarballFileResolver.ts
@@ -1,4 +1,4 @@
-import type {Resolver, ResolveOptions, MinimalResolveOptions} from '@yarnpkg/core';
+import {Resolver, ResolveOptions, MinimalResolveOptions} from '@yarnpkg/core';
 import {Descriptor, Locator, Manifest}                        from '@yarnpkg/core';
 import {LinkType}                                             from '@yarnpkg/core';
 import {miscUtils, structUtils}                               from '@yarnpkg/core';

diff --git a/packages/plugin-file/sources/index.ts b/packages/plugin-file/sources/index.ts
@@ -1,4 +1,4 @@
-import type {Plugin}         from '@yarnpkg/core';
+import {Plugin}         from '@yarnpkg/core';
 
 import {FileFetcher}         from './FileFetcher';
 import {FileResolver}        from './FileResolver';

diff --git a/packages/plugin-git/sources/GitFetcher.ts b/packages/plugin-git/sources/GitFetcher.ts
@@ -1,10 +1,10 @@
-import type {Fetcher, FetchOptions, MinimalFetchOptions, FetchResult} from '@yarnpkg/core';
-import type {Locator}                                                 from '@yarnpkg/core';
+import {Fetcher, FetchOptions, MinimalFetchOptions, FetchResult} from '@yarnpkg/core';
+import {Locator}                                                 from '@yarnpkg/core';
 import {miscUtils, scriptUtils, structUtils, tgzUtils}                from '@yarnpkg/core';
 import {PortablePath, ppath, xfs}                                     from '@yarnpkg/fslib';
 
 import * as gitUtils                                                  from './gitUtils';
-import type {Hooks}                                                   from './index';
+import {Hooks}                                                   from './index';
 
 export class GitFetcher implements Fetcher {
   supports(locator: Locator, opts: MinimalFetchOptions) {

diff --git a/packages/plugin-git/sources/GitResolver.ts b/packages/plugin-git/sources/GitResolver.ts
@@ -1,4 +1,4 @@
-import type {Resolver, ResolveOptions, MinimalResolveOptions} from '@yarnpkg/core';
+import {Resolver, ResolveOptions, MinimalResolveOptions} from '@yarnpkg/core';
 import {miscUtils, structUtils}                               from '@yarnpkg/core';
 import {LinkType}                                             from '@yarnpkg/core';
 import {Descriptor, Locator, Manifest}                        from '@yarnpkg/core';

diff --git a/packages/plugin-github/sources/GithubFetcher.ts b/packages/plugin-github/sources/GithubFetcher.ts
@@ -1,5 +1,5 @@
-import type {Fetcher, FetchOptions, MinimalFetchOptions} from '@yarnpkg/core';
-import type {Locator}                                    from '@yarnpkg/core';
+import {Fetcher, FetchOptions, MinimalFetchOptions} from '@yarnpkg/core';
+import {Locator}                                    from '@yarnpkg/core';
 import {httpUtils, scriptUtils, structUtils, tgzUtils}   from '@yarnpkg/core';
 import {PortablePath, CwdFS, ppath, xfs}                 from '@yarnpkg/fslib';
 import {gitUtils}                                        from '@yarnpkg/plugin-git';

diff --git a/packages/plugin-github/sources/index.ts b/packages/plugin-github/sources/index.ts
@@ -1,5 +1,5 @@
-import type {Plugin}            from '@yarnpkg/core';
-import type {Hooks as GitHooks} from '@yarnpkg/plugin-git';
+import {Plugin}            from '@yarnpkg/core';
+import {Hooks as GitHooks} from '@yarnpkg/plugin-git';
 
 import {GithubFetcher}          from './GithubFetcher';
 

diff --git a/packages/plugin-http/sources/TarballHttpFetcher.ts b/packages/plugin-http/sources/TarballHttpFetcher.ts
@@ -1,5 +1,5 @@
-import type {Fetcher, FetchOptions, MinimalFetchOptions} from '@yarnpkg/core';
-import type {Locator}                                    from '@yarnpkg/core';
+import {Fetcher, FetchOptions, MinimalFetchOptions} from '@yarnpkg/core';
+import {Locator}                                    from '@yarnpkg/core';
 import {httpUtils, structUtils, tgzUtils}                from '@yarnpkg/core';
 
 import {TARBALL_REGEXP, PROTOCOL_REGEXP}                 from './constants';

diff --git a/packages/plugin-http/sources/TarballHttpResolver.ts b/packages/plugin-http/sources/TarballHttpResolver.ts
@@ -1,4 +1,4 @@
-import type {Resolver, ResolveOptions, MinimalResolveOptions} from '@yarnpkg/core';
+import {Resolver, ResolveOptions, MinimalResolveOptions} from '@yarnpkg/core';
 import {Descriptor, Locator, Manifest}                        from '@yarnpkg/core';
 import {LinkType}                                             from '@yarnpkg/core';
 import {miscUtils, structUtils}                               from '@yarnpkg/core';

diff --git a/packages/plugin-http/sources/index.ts b/packages/plugin-http/sources/index.ts
@@ -1,4 +1,4 @@
-import type {Plugin}         from '@yarnpkg/core';
+import {Plugin}         from '@yarnpkg/core';
 
 import {TarballHttpFetcher}  from './TarballHttpFetcher';
 import {TarballHttpResolver} from './TarballHttpResolver';

diff --git a/packages/plugin-interactive-tools/sources/index.ts b/packages/plugin-interactive-tools/sources/index.ts
@@ -1,4 +1,4 @@
-import type {Plugin}      from '@yarnpkg/core';
+import {Plugin}      from '@yarnpkg/core';
 
 import search             from './commands/search';
 import upgradeInteractive from './commands/upgrade-interactive';

diff --git a/packages/plugin-link/sources/LinkFetcher.ts b/packages/plugin-link/sources/LinkFetcher.ts
@@ -1,5 +1,5 @@
-import type {Fetcher, FetchOptions, FetchResult, MinimalFetchOptions} from '@yarnpkg/core';
-import type {Locator}                                                 from '@yarnpkg/core';
+import {Fetcher, FetchOptions, FetchResult, MinimalFetchOptions} from '@yarnpkg/core';
+import {Locator}                                                 from '@yarnpkg/core';
 import {structUtils}                                             from '@yarnpkg/core';
 import {CwdFS, JailFS, ppath, PortablePath}                      from '@yarnpkg/fslib';
 

diff --git a/packages/plugin-link/sources/LinkResolver.ts b/packages/plugin-link/sources/LinkResolver.ts
@@ -1,4 +1,4 @@
-import type {Resolver, ResolveOptions, MinimalResolveOptions} from '@yarnpkg/core';
+import {Resolver, ResolveOptions, MinimalResolveOptions} from '@yarnpkg/core';
 import {Descriptor, Locator, Manifest, Package}               from '@yarnpkg/core';
 import {LinkType}                                             from '@yarnpkg/core';
 import {miscUtils, structUtils}                               from '@yarnpkg/core';

diff --git a/packages/plugin-link/sources/RawLinkFetcher.ts b/packages/plugin-link/sources/RawLinkFetcher.ts
@@ -1,5 +1,5 @@
-import type {Fetcher, FetchOptions, FetchResult, MinimalFetchOptions} from '@yarnpkg/core';
-import type {Locator}                                                 from '@yarnpkg/core';
+import {Fetcher, FetchOptions, FetchResult, MinimalFetchOptions} from '@yarnpkg/core';
+import {Locator}                                                 from '@yarnpkg/core';
 import {structUtils}                                             from '@yarnpkg/core';
 import {CwdFS, JailFS, ppath, PortablePath}                      from '@yarnpkg/fslib';
 

diff --git a/packages/plugin-link/sources/RawLinkResolver.ts b/packages/plugin-link/sources/RawLinkResolver.ts
@@ -1,5 +1,5 @@
-import type {Resolver, ResolveOptions, MinimalResolveOptions} from '@yarnpkg/core';
-import type {Descriptor, Locator}                             from '@yarnpkg/core';
+import {Resolver, ResolveOptions, MinimalResolveOptions} from '@yarnpkg/core';
+import {Descriptor, Locator}                             from '@yarnpkg/core';
 import {LinkType}                                             from '@yarnpkg/core';
 import {structUtils}                                          from '@yarnpkg/core';
 import {npath}                                                from '@yarnpkg/fslib';

diff --git a/packages/plugin-link/sources/index.ts b/packages/plugin-link/sources/index.ts
@@ -1,4 +1,4 @@
-import type {Plugin}     from '@yarnpkg/core';
+import {Plugin}     from '@yarnpkg/core';
 
 import {LinkFetcher}     from './LinkFetcher';
 import {LinkResolver}    from './LinkResolver';