Skip to content

Commit 6196b64

Browse files
rigor789rigor789
committed
refactor: move package managers into a dir
1 parent dd09547 commit 6196b64

13 files changed

Lines changed: 83 additions & 78 deletions

‎lib/bootstrap.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -210,10 +210,10 @@ injector.require(
210210

211211
injector.requireCommand("setup|*", "./commands/setup");
212212

213-
injector.requirePublic("packageManager", "./package-manager");
214-
injector.requirePublic("npm", "./node-package-manager");
215-
injector.requirePublic("yarn", "./yarn-package-manager");
216-
injector.requirePublic("pnpm", "./pnpm-package-manager");
213+
injector.requirePublic("packageManager", "./package-managers/index");
214+
injector.requirePublic("npm", "./package-managers/npm");
215+
injector.requirePublic("pnpm", "./package-managers/pnpm");
216+
injector.requirePublic("yarn", "./package-managers/yarn");
217217
injector.requireCommand(
218218
"package-manager|*get",
219219
"./commands/package-manager-get"
@@ -225,7 +225,7 @@ injector.requireCommand(
225225

226226
injector.require(
227227
"packageInstallationManager",
228-
"./package-installation-manager"
228+
"./package-managers/package-installation-manager"
229229
);
230230

231231
injector.require("deviceLogProvider", "./common/mobile/device-log-provider");

lib/base-package-manager.ts renamed to lib/package-managers/base-package-manager.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
import { isInteractive } from "./common/helpers";
1+
import { isInteractive } from "../common/helpers";
22
import {
33
INodePackageManager,
44
INodePackageManagerInstallOptions,
55
INpmInstallResultInfo,
66
INpmsResult,
77
INpmPackageNameParts,
8-
} from "./declarations";
8+
} from "../declarations";
99
import {
1010
IDictionary,
1111
IChildProcess,
1212
IFileSystem,
1313
IHostInfo,
14-
} from "./common/declarations";
14+
} from "../common/declarations";
1515

1616
export abstract class BasePackageManager implements INodePackageManager {
1717
public abstract install(

lib/package-manager.ts renamed to lib/package-managers/index.ts

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import { cache, exported, invokeInit } from "./common/decorators";
2-
import { performanceLog } from "./common/decorators";
3-
import { PackageManagers } from "./constants";
1+
import { cache, exported, invokeInit } from "../common/decorators";
2+
import { performanceLog } from "../common/decorators";
3+
import { PackageManagers } from "../constants";
44
import {
55
IPackageManager,
66
INodePackageManager,
@@ -9,13 +9,14 @@ import {
99
INpmInstallResultInfo,
1010
INpmsResult,
1111
INpmPackageNameParts,
12-
} from "./declarations";
12+
} from "../declarations";
1313
import {
1414
IErrors,
1515
IUserSettingsService,
1616
IDictionary,
17-
} from "./common/declarations";
18-
import { injector } from "./common/yok";
17+
} from "../common/declarations";
18+
import { injector } from "../common/yok";
19+
1920
export class PackageManager implements IPackageManager {
2021
private packageManager: INodePackageManager;
2122
private _packageManagerName: string;
@@ -153,4 +154,8 @@ export class PackageManager implements IPackageManager {
153154
}
154155
}
155156

157+
// export { NPM } from './npm'
158+
// export { PNPM } from './pnpm'
159+
// export { Yarn } from './yarn'
160+
156161
injector.register("packageManager", PackageManager);

lib/node-package-manager.ts renamed to lib/package-managers/npm.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
import { join, relative } from "path";
22
import { BasePackageManager } from "./base-package-manager";
3-
import { exported, cache } from "./common/decorators";
4-
import { CACACHE_DIRECTORY_NAME } from "./constants";
3+
import { exported, cache } from "../common/decorators";
4+
import { CACACHE_DIRECTORY_NAME } from "../constants";
55
import * as _ from "lodash";
66
import {
77
INodePackageManagerInstallOptions,
88
INpmInstallResultInfo,
99
INpmsResult,
10-
} from "./declarations";
10+
} from "../declarations";
1111
import {
1212
IChildProcess,
1313
IErrors,
1414
IFileSystem,
1515
IHostInfo,
1616
Server,
17-
} from "./common/declarations";
18-
import { injector } from "./common/yok";
17+
} from "../common/declarations";
18+
import { injector } from "../common/yok";
1919

20-
export class NodePackageManager extends BasePackageManager {
20+
export class NPM extends BasePackageManager {
2121
constructor(
2222
$childProcess: IChildProcess,
2323
private $errors: IErrors,
@@ -167,4 +167,4 @@ export class NodePackageManager extends BasePackageManager {
167167
}
168168
}
169169

170-
injector.register("npm", NodePackageManager);
170+
injector.register("npm", NPM);

lib/package-installation-manager.ts renamed to lib/package-managers/package-installation-manager.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
import * as path from "path";
2-
import * as constants from "./constants";
2+
import * as constants from "../constants";
33
import {
44
INpmInstallOptions,
55
INpmInstallResultInfo,
66
IPackageInstallationManager,
77
IPackageManager,
88
IStaticConfig,
9-
} from "./declarations";
10-
import { IProjectDataService } from "./definitions/project";
9+
} from "../declarations";
10+
import { IProjectDataService } from "../definitions/project";
1111
import {
1212
IChildProcess,
1313
IDictionary,
1414
IFileSystem,
1515
ISettingsService,
16-
} from "./common/declarations";
17-
import { injector } from "./common/yok";
16+
} from "../common/declarations";
17+
import { injector } from "../common/yok";
1818

1919
const semver = require("semver");
2020

lib/pnpm-package-manager.ts renamed to lib/package-managers/pnpm.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
import * as path from "path";
22
import * as _ from "lodash";
33
import { BasePackageManager } from "./base-package-manager";
4-
import { exported } from "./common/decorators";
5-
import { CACACHE_DIRECTORY_NAME } from "./constants";
4+
import { exported } from "../common/decorators";
5+
import { CACACHE_DIRECTORY_NAME } from "../constants";
66
import {
77
INodePackageManagerInstallOptions,
88
INpmInstallResultInfo,
99
INpmsResult,
10-
} from "./declarations";
10+
} from "../declarations";
1111
import {
1212
IChildProcess,
1313
IErrors,
1414
IFileSystem,
1515
IHostInfo,
1616
Server,
1717
IDictionary,
18-
} from "./common/declarations";
19-
import { injector } from "./common/yok";
18+
} from "../common/declarations";
19+
import { injector } from "../common/yok";
2020

21-
export class PnpmPackageManager extends BasePackageManager {
21+
export class PNPM extends BasePackageManager {
2222
constructor(
2323
$childProcess: IChildProcess,
2424
private $errors: IErrors,
@@ -145,4 +145,4 @@ export class PnpmPackageManager extends BasePackageManager {
145145
}
146146
}
147147

148-
injector.register("pnpm", PnpmPackageManager);
148+
injector.register("pnpm", PNPM);

lib/yarn-package-manager.ts renamed to lib/package-managers/yarn.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
import * as path from "path";
22
import * as _ from "lodash";
33
import { BasePackageManager } from "./base-package-manager";
4-
import { exported } from "./common/decorators";
4+
import { exported } from "../common/decorators";
55
import {
66
INodePackageManagerInstallOptions,
77
INpmInstallResultInfo,
88
INpmsResult,
9-
} from "./declarations";
9+
} from "../declarations";
1010
import {
1111
IChildProcess,
1212
IErrors,
1313
IFileSystem,
1414
IHostInfo,
1515
Server,
1616
IDictionary,
17-
} from "./common/declarations";
18-
import { injector } from "./common/yok";
17+
} from "../common/declarations";
18+
import { injector } from "../common/yok";
1919

20-
export class YarnPackageManager extends BasePackageManager {
20+
export class Yarn extends BasePackageManager {
2121
constructor(
2222
$childProcess: IChildProcess,
2323
private $errors: IErrors,
@@ -143,4 +143,4 @@ export class YarnPackageManager extends BasePackageManager {
143143
}
144144
}
145145

146-
injector.register("yarn", YarnPackageManager);
146+
injector.register("yarn", Yarn);

‎test/controllers/add-platform-controller.ts‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ import { assert } from "chai";
55
import { format } from "util";
66
import * as _ from "lodash";
77
import { AddPlaformErrors } from "../../lib/constants";
8-
import { PackageManager } from "../../lib/package-manager";
9-
import { NodePackageManager } from "../../lib/node-package-manager";
10-
import { YarnPackageManager } from "../../lib/yarn-package-manager";
11-
import { PnpmPackageManager } from "../../lib/pnpm-package-manager";
8+
import { PackageManager } from "../../lib/package-managers";
9+
import { NPM } from "../../lib/package-managers/npm";
10+
import { PNPM } from "../../lib/package-managers/pnpm";
11+
import { Yarn } from "../../lib/package-managers/yarn";
1212

1313
let actualMessage: string = null;
1414
const latestFrameworkVersion = "5.3.1";
@@ -26,9 +26,9 @@ function createInjector(data?: { latestFrameworkVersion: string }) {
2626
trackEventActionInGoogleAnalytics: () => ({}),
2727
});
2828
injector.register("packageManager", PackageManager);
29-
injector.register("npm", NodePackageManager);
30-
injector.register("yarn", YarnPackageManager);
31-
injector.register("pnpm", PnpmPackageManager);
29+
injector.register("npm", NPM);
30+
injector.register("yarn", Yarn);
31+
injector.register("pnpm", PNPM);
3232
injector.register("userSettingsService", {
3333
getSettingValue: async (settingName: string): Promise<void> => undefined,
3434
});

‎test/ios-project-service.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ import { IOSDeviceDiscovery } from "../lib/common/mobile/mobile-core/ios-device-
2424
import { AndroidDeviceDiscovery } from "../lib/common/mobile/mobile-core/android-device-discovery";
2525
import { Utils } from "../lib/common/utils";
2626
import { CocoaPodsService } from "../lib/services/cocoapods-service";
27-
import { PackageManager } from "../lib/package-manager";
28-
import { NodePackageManager } from "../lib/node-package-manager";
29-
import { YarnPackageManager } from "../lib/yarn-package-manager";
27+
import { PackageManager } from "../lib/package-managers";
28+
import { NPM } from "../lib/package-managers/npm";
29+
import { Yarn } from "../lib/package-managers/yarn";
3030

3131
import { assert } from "chai";
3232
import { SettingsService } from "../lib/common/test/unit-tests/stubs";
@@ -173,8 +173,8 @@ function createTestInjector(
173173
getSettingValue: async (settingName: string): Promise<void> => undefined,
174174
});
175175
testInjector.register("packageManager", PackageManager);
176-
testInjector.register("npm", NodePackageManager);
177-
testInjector.register("yarn", YarnPackageManager);
176+
testInjector.register("npm", NPM);
177+
testInjector.register("yarn", Yarn);
178178
testInjector.register("xcconfigService", XcconfigService);
179179
testInjector.register("settingsService", SettingsService);
180180
testInjector.register("httpClient", {});

‎test/node-package-manager.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { Yok } from "../lib/common/yok";
22
import * as stubs from "./stubs";
33
import { assert } from "chai";
4-
import { NodePackageManager } from "../lib/node-package-manager";
4+
import { NPM } from "../lib/package-managers/npm";
55
import { IInjector } from "../lib/common/definitions/yok";
66

77
function createTestInjector(configuration: {} = {}): IInjector {
@@ -12,7 +12,7 @@ function createTestInjector(configuration: {} = {}): IInjector {
1212
injector.register("childProcess", stubs.ChildProcessStub);
1313
injector.register("httpClient", {});
1414
injector.register("fs", stubs.FileSystemStub);
15-
injector.register("npm", NodePackageManager);
15+
injector.register("npm", NPM);
1616
injector.register("pacoteService", {
1717
manifest: () => Promise.resolve(),
1818
});
@@ -52,7 +52,7 @@ describe("node-package-manager", () => {
5252
].forEach((testCase) => {
5353
it(testCase.name, async () => {
5454
const testInjector = createTestInjector();
55-
const npm = testInjector.resolve<NodePackageManager>("npm");
55+
const npm = testInjector.resolve<NPM>("npm");
5656
const templateNameParts = await npm.getPackageNameParts(
5757
testCase.templateFullName
5858
);
@@ -87,7 +87,7 @@ describe("node-package-manager", () => {
8787
].forEach((testCase) => {
8888
it(testCase.name, async () => {
8989
const testInjector = createTestInjector();
90-
const npm = testInjector.resolve<NodePackageManager>("npm");
90+
const npm = testInjector.resolve<NPM>("npm");
9191
const templateFullName = await npm.getPackageFullName({
9292
name: testCase.templateName,
9393
version: testCase.templateVersion,

0 commit comments

Comments
 (0)