feat: workspace support (#5552)

rigor789 · web-flow · commit e15ee69f2bb8 · 2021-07-26T16:00:21.000+02:00
diff --git a/lib/commands/plugin/build-plugin.ts b/lib/commands/plugin/build-plugin.ts
@@ -9,6 +9,7 @@ import {
 import { ICommand, ICommandParameter } from "../../common/definitions/commands";
 import { IErrors, IFileSystem } from "../../common/declarations";
 import { injector } from "../../common/yok";
+import { ITempService } from "../../definitions/temp-service";
 
 export class BuildPluginCommand implements ICommand {
 	public allowedParameters: ICommandParameter[] = [];
diff --git a/lib/common/definitions/temp.d.ts b/lib/common/definitions/temp.d.ts
diff --git a/lib/common/mobile/android/android-device-file-system.ts b/lib/common/mobile/android/android-device-file-system.ts
@@ -6,6 +6,7 @@ import { executeActionByChunks } from "../../helpers";
 import { DEFAULT_CHUNK_SIZE } from "../../constants";
 import { IFileSystem, IStringDictionary } from "../../declarations";
 import { IInjector } from "../../definitions/yok";
+import { ITempService } from "../../../definitions/temp-service";
 
 export class AndroidDeviceFileSystem implements Mobile.IDeviceFileSystem {
 	private _deviceHashServices = Object.create(null);
diff --git a/lib/common/mobile/android/android-device-hash-service.ts b/lib/common/mobile/android/android-device-hash-service.ts
@@ -4,6 +4,7 @@ import { cache } from "../../decorators";
 import { executeActionByChunks } from "../../helpers";
 import { DEFAULT_CHUNK_SIZE, LiveSyncPaths } from "../../constants";
 import { IFileSystem, IStringDictionary } from "../../declarations";
+import { ITempService } from "../../../definitions/temp-service";
 
 export class AndroidDeviceHashService
 	implements Mobile.IAndroidDeviceHashService {
diff --git a/lib/common/mobile/ios/simulator/ios-simulator-application-manager.ts b/lib/common/mobile/ios/simulator/ios-simulator-application-manager.ts
@@ -13,6 +13,7 @@ import {
 	IFileSystem,
 	IHooksService,
 } from "../../../declarations";
+import { ITempService } from "../../../../definitions/temp-service";
 
 export class IOSSimulatorApplicationManager extends ApplicationManagerBase {
 	private _lldbProcesses: IDictionary<ChildProcess> = {};
diff --git a/lib/common/mobile/mobile-helper.ts b/lib/common/mobile/mobile-helper.ts
@@ -4,6 +4,7 @@ import * as _ from "lodash";
 import { IProjectData } from "../../definitions/project";
 import { IErrors, IFileSystem } from "../declarations";
 import { injector } from "../yok";
+import { ITempService } from "../../definitions/temp-service";
 
 export class MobileHelper implements Mobile.IMobileHelper {
 	private static DEVICE_PATH_SEPARATOR = "/";
diff --git a/lib/definitions/temp-service.d.ts b/lib/definitions/temp-service.d.ts
@@ -1,7 +1,9 @@
+import { AffixOptions } from "temp";
+
 /**
  * Declares wrapped functions of temp module
  */
 interface ITempService {
-	mkdirSync(affixes: string): Promise<string>;
-	path(options: ITempPathOptions): Promise<string>;
+	mkdirSync(affixes: string | AffixOptions): Promise<string>;
+	path(options: string | AffixOptions): Promise<string>;
 }
diff --git a/lib/device-sockets/ios/app-debug-socket-proxy-factory.ts b/lib/device-sockets/ios/app-debug-socket-proxy-factory.ts
@@ -6,6 +6,7 @@ import { MessageUnpackStream } from "ios-device-lib";
 import { IAppDebugSocketProxyFactory, IOptions } from "../../declarations";
 import { IDictionary, IErrors, INet } from "../../common/declarations";
 import { injector } from "../../common/yok";
+import { ITempService } from "../../definitions/temp-service";
 
 export class AppDebugSocketProxyFactory
 	extends EventEmitter
diff --git a/lib/helpers/platform-command-helper.ts b/lib/helpers/platform-command-helper.ts
@@ -13,6 +13,7 @@ import {
 import { IPlatformsDataService, IPlatformData } from "../definitions/platform";
 import { IFileSystem, IErrors } from "../common/declarations";
 import { injector } from "../common/yok";
+import { ITempService } from "../definitions/temp-service";
 
 export class PlatformCommandHelper implements IPlatformCommandHelper {
 	constructor(
diff --git a/lib/services/ios-project-service.ts b/lib/services/ios-project-service.ts
@@ -13,7 +13,7 @@ import { IOSProvisionService } from "./ios-provision-service";
 import { IOSEntitlementsService } from "./ios-entitlements-service";
 import { IOSBuildData } from "../data/build-data";
 import { IOSPrepareData } from "../data/prepare-data";
-import { BUILD_XCCONFIG_FILE_NAME, IosProjectConstants } from "../constants";
+import { BUILD_XCCONFIG_FILE_NAME, CONFIG_FILE_NAME_DISPLAY, IosProjectConstants } from "../constants";
 import { hook } from "../common/helpers";
 import {
 	IPlatformData,
@@ -45,6 +45,7 @@ import { IInjector } from "../common/definitions/yok";
 import { injector } from "../common/yok";
 import { INotConfiguredEnvOptions } from "../common/definitions/commands";
 import { IProjectChangesInfo } from "../definitions/project-changes";
+import { ITempService } from "../definitions/temp-service";
 
 interface INativeSourceCodeGroup {
 	name: string;
@@ -1489,7 +1490,7 @@ export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServ
 			infoPlist.CFBundleIdentifier !== mergedPlist.CFBundleIdentifier
 		) {
 			this.$logger.warn(
-				"[WARNING]: The CFBundleIdentifier key inside the 'Info.plist' will be overriden by the 'id' inside 'package.json'."
+				`[WARNING]: The CFBundleIdentifier key inside the 'Info.plist' will be overriden by the 'id' set inside the "${CONFIG_FILE_NAME_DISPLAY}".`
 			);
 		}
 	}
diff --git a/lib/services/ios/export-options-plist-service.ts b/lib/services/ios/export-options-plist-service.ts
@@ -3,6 +3,7 @@ import * as mobileProvisionFinder from "ios-mobileprovision-finder";
 import { IProjectData, IBuildConfig } from "../../definitions/project";
 import { IFileSystem } from "../../common/declarations";
 import { injector } from "../../common/yok";
+import { ITempService } from "../../definitions/temp-service";
 
 export class ExportOptionsPlistService implements IExportOptionsPlistService {
 	constructor(private $fs: IFileSystem, private $tempService: ITempService) {}
diff --git a/lib/services/itmstransporter-service.ts b/lib/services/itmstransporter-service.ts
@@ -14,6 +14,7 @@ import {
 import { IApplePortalApplicationService } from "./apple-portal/definitions";
 import { IInjector } from "../common/definitions/yok";
 import { injector } from "../common/yok";
+import { ITempService } from "../definitions/temp-service";
 
 export class ITMSTransporterService implements IITMSTransporterService {
 	constructor(
diff --git a/lib/services/livesync/android-device-livesync-sockets-service.ts b/lib/services/livesync/android-device-livesync-sockets-service.ts
@@ -13,6 +13,7 @@ import { IFilesHashService } from "../../definitions/files-hash-service";
 import { IInjector } from "../../common/definitions/yok";
 import { ICleanupService } from "../../definitions/cleanup-service";
 import { ISpawnCommandInfo } from "../../detached-processes/cleanup-process-definitions";
+import { ITempService } from "../../definitions/temp-service";
 
 export class AndroidDeviceSocketsLiveSyncService
 	extends AndroidDeviceLiveSyncServiceBase
diff --git a/lib/services/livesync/ios-livesync-service.ts b/lib/services/livesync/ios-livesync-service.ts
@@ -12,6 +12,7 @@ import {
 } from "../../common/declarations";
 import { IInjector } from "../../common/definitions/yok";
 import { injector } from "../../common/yok";
+import { ITempService } from "../../definitions/temp-service";
 
 export class IOSLiveSyncService
 	extends PlatformLiveSyncServiceBase
diff --git a/lib/services/plugins-service.ts b/lib/services/plugins-service.ts
@@ -276,40 +276,30 @@ export class PluginsService implements IPluginsService {
 	public async ensureAllDependenciesAreInstalled(
 		projectData: IProjectData
 	): Promise<void> {
-		let installedDependencies = this.$fs.exists(
-			this.getNodeModulesPath(projectData.projectDir)
-		)
-			? this.$fs.readDirectory(this.getNodeModulesPath(projectData.projectDir))
-			: [];
-		// Scoped dependencies are not on the root of node_modules,
-		// so we have to list the contents of all directories, starting with @
-		// and add them to installed dependencies, so we can apply correct comparison against package.json's dependencies.
-		_(installedDependencies)
-			.filter((dependencyName) => _.startsWith(dependencyName, "@"))
-			.each((scopedDependencyDir) => {
-				const contents = this.$fs.readDirectory(
-					path.join(
-						this.getNodeModulesPath(projectData.projectDir),
-						scopedDependencyDir
-					)
-				);
-				installedDependencies = installedDependencies.concat(
-					contents.map(
-						(dependencyName) => `${scopedDependencyDir}/${dependencyName}`
-					)
-				);
-			});
-
 		const packageJsonContent = this.$fs.readJson(
 			this.getPackageJsonFilePath(projectData.projectDir)
 		);
 		const allDependencies = _.keys(packageJsonContent.dependencies).concat(
 			_.keys(packageJsonContent.devDependencies)
 		);
-		const notInstalledDependencies = _.difference(
-			allDependencies,
-			installedDependencies
-		);
+
+		const notInstalledDependencies = allDependencies.map(dep => {
+		  try {
+		    this.$logger.trace(`Checking if ${dep} is installed...`);
+		    require.resolve(`${dep}/package.json`, {
+		      paths: [projectData.projectDir]
+        })
+
+        // return false if the dependency is installed - we'll filter out boolean values
+        // and end up with an array of dep names that are not installed if we end up
+        // inside the catch block.
+        return false;
+      } catch(err) {
+		    this.$logger.trace(`Error while checking if ${dep} is installed. Error is: `, err)
+		    return dep;
+      }
+    }).filter(Boolean);
+
 		if (this.$options.force || notInstalledDependencies.length) {
 			this.$logger.trace(
 				"Npm install will be called from CLI. Force option is: ",
diff --git a/lib/services/project-service.ts b/lib/services/project-service.ts
@@ -28,6 +28,7 @@ import {
 } from "../common/declarations";
 import * as _ from "lodash";
 import { injector } from "../common/yok";
+import { ITempService } from "../definitions/temp-service";
 
 export class ProjectService implements IProjectService {
 	constructor(
diff --git a/lib/services/temp-service.ts b/lib/services/temp-service.ts
@@ -1,20 +1,21 @@
 import * as temp from "temp";
 import { ICleanupService } from "../definitions/cleanup-service";
-import * as _ from "lodash";
 import { injector } from "../common/yok";
+import { AffixOptions } from "temp";
+import { ITempService } from "../definitions/temp-service";
 
 export class TempService implements ITempService {
 	constructor(private $cleanupService: ICleanupService) {
 		temp.track();
 	}
 
-	public async mkdirSync(affixes: string): Promise<string> {
+	public async mkdirSync(affixes: string | AffixOptions): Promise<string> {
 		const pathToDir = temp.mkdirSync(affixes);
 		await this.$cleanupService.addCleanupDeleteAction(pathToDir);
 		return pathToDir;
 	}
 
-	public async path(options: ITempPathOptions): Promise<string> {
+	public async path(options: string | AffixOptions): Promise<string> {
 		const pathToFile = temp.path(options);
 		await this.$cleanupService.addCleanupDeleteAction(pathToFile);
 		return pathToFile;
diff --git a/lib/tools/node-modules/node-modules-dependencies-builder.ts b/lib/tools/node-modules/node-modules-dependencies-builder.ts
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
diff --git a/test/stubs.ts b/test/stubs.ts
diff --git a/test/tools/node-modules/node-modules-dependencies-builder.ts b/test/tools/node-modules/node-modules-dependencies-builder.ts
diff --git a/yarn.lock b/yarn.lock
