Skip to content

Conform ios inspector code with npm 5 #2862

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 31, 2017
Merged

Conform ios inspector code with npm 5 #2862

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions lib/constants.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,3 +71,4 @@ export const TYPESCRIPT_NAME = "typescript";
export const BUILD_OUTPUT_EVENT_NAME = "buildOutput";
export const CONNECTION_ERROR_EVENT_NAME = "connectionError";
export const VERSION_STRING = "version";
export const INSPECTOR_CACHE_DIRNAME = "ios-inspector";
31 changes: 21 additions & 10 deletions lib/npm-installation-manager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,27 +47,38 @@ export class NpmInstallationManager implements INpmInstallationManager {
}

public async getInspectorFromCache(inspectorNpmPackageName: string, projectDir: string): Promise<string> {
let inspectorPath = path.join(projectDir, "node_modules", inspectorNpmPackageName);
let inspectorPath = path.join(projectDir, constants.NODE_MODULES_FOLDER_NAME, inspectorNpmPackageName);

// local installation takes precedence over cache
if (!this.inspectorAlreadyInstalled(inspectorPath)) {
let cachepath = (await this.$childProcess.exec("npm get cache")).trim();
let version = await this.getLatestCompatibleVersion(inspectorNpmPackageName);
let pathToPackageInCache = path.join(cachepath, inspectorNpmPackageName, version);
let pathToUnzippedInspector = path.join(pathToPackageInCache, "package");
const cachePath = path.join(this.$options.profileDir, constants.INSPECTOR_CACHE_DIRNAME);
this.prepareCacheDir(cachePath);
const pathToPackageInCache = path.join(cachePath, constants.NODE_MODULES_FOLDER_NAME, inspectorNpmPackageName);

if (!this.$fs.exists(pathToPackageInCache)) {
await this.$childProcess.exec(`npm cache add ${inspectorNpmPackageName}@${version}`);
let inspectorTgzPathInCache = path.join(pathToPackageInCache, "package.tgz");
await this.$childProcess.exec(`tar -xf ${inspectorTgzPathInCache} -C ${pathToPackageInCache}`);
await this.$childProcess.exec(`npm install --prefix ${pathToUnzippedInspector}`);
const version = await this.getLatestCompatibleVersion(inspectorNpmPackageName);
await this.$childProcess.exec(`npm install ${inspectorNpmPackageName}@${version} --prefix ${cachePath}`);
}

this.$logger.out("Using inspector from cache.");
return pathToUnzippedInspector;
return pathToPackageInCache;
}

return inspectorPath;
}

private prepareCacheDir(cacheDirName: string): void {
this.$fs.ensureDirectoryExists(cacheDirName);

const cacheDirPackageJsonLocation = path.join(cacheDirName, constants.PACKAGE_JSON_FILE_NAME);
if (!this.$fs.exists(cacheDirPackageJsonLocation)) {
this.$fs.writeJson(cacheDirPackageJsonLocation, {
name: constants.INSPECTOR_CACHE_DIRNAME,
version: "0.1.0"
});
}
}

private inspectorAlreadyInstalled(pathToInspector: string): Boolean {
if (this.$fs.exists(pathToInspector)) {
return true;
Expand Down