deps(beemo-dev): Update to latest configs.

beemojs · Mar 1, 2022 · fd4ef40 · fd4ef40
1 parent c9f7052
commit fd4ef40
Show file tree

Hide file tree

Showing 9 changed files with 386 additions and 377 deletions.
diff --git a/package.json b/package.json
@@ -38,7 +38,7 @@
     "lerna": "^4.0.0",
     "packemon": "^1.9.0",
     "ts-node": "^10.5.0",
-    "typescript": "^4.5.4",
+    "typescript": "^4.6.2",
     "webpack": "^5.69.1"
   },
   "resolutions": {

diff --git a/packages/core/src/routines/CreateConfigRoutine.ts b/packages/core/src/routines/CreateConfigRoutine.ts
@@ -80,7 +80,7 @@ export class CreateConfigRoutine<Ctx extends ConfigContext> extends Routine<
 				break;
 		}
 
-		return Promise.resolve(new Path());
+		return new Path();
 	}
 
 	/**
@@ -278,7 +278,7 @@ export class CreateConfigRoutine<Ctx extends ConfigContext> extends Routine<
 	 * Merge multiple configuration sources using the current driver.
 	 */
 	@Bind()
-	async mergeConfigs(context: Ctx, configs: ConfigObject[]): Promise<ConfigObject> {
+	mergeConfigs(context: Ctx, configs: ConfigObject[]): ConfigObject {
 		const { driver } = this.options;
 
 		this.debug('Merging %s config from %d sources', color.symbol(driver.getName()), configs.length);
@@ -291,7 +291,7 @@ export class CreateConfigRoutine<Ctx extends ConfigContext> extends Routine<
 
 		driver.onMergeConfig.emit([context, config]);
 
-		return Promise.resolve(config);
+		return config;
 	}
 
 	/**
@@ -331,7 +331,7 @@ export class CreateConfigRoutine<Ctx extends ConfigContext> extends Routine<
 			this.options.driver.onLoadConsumerConfig.emit([context, config]);
 		}
 
-		return Promise.resolve(configs);
+		return configs;
 	}
 
 	/**
@@ -350,7 +350,7 @@ export class CreateConfigRoutine<Ctx extends ConfigContext> extends Routine<
 			this.options.driver.onLoadProviderConfig.emit([context, sourcePath, config]);
 		}
 
-		return Promise.resolve(configs);
+		return configs;
 	}
 
 	/**

diff --git a/packages/core/src/routines/ScaffoldRoutine.ts b/packages/core/src/routines/ScaffoldRoutine.ts
@@ -42,6 +42,7 @@ export class ScaffoldRoutine extends Routine<unknown, unknown, RoutineOptions> {
 				createPrompter: this.handlePrompter,
 				cwd: tool.cwd.path(),
 				debug: tool.config.debug,
+				// eslint-disable-next-line @typescript-eslint/no-misused-promises
 				exec: this.handleExec,
 				logger: new Logger(console.log),
 				templates,
@@ -59,12 +60,13 @@ export class ScaffoldRoutine extends Routine<unknown, unknown, RoutineOptions> {
 	/**
 	 * Handle shell executions from hygen.
 	 */
-	private handleExec = (action: string, input: string) =>
-		this.executeCommand(action, [], {
+	private handleExec = async (action: string, input: string) => {
+		await this.executeCommand(action, [], {
 			input,
 			preferLocal: true,
 			shell: true,
 		});
+	};
 
 	/**
 	 * Temporary solution until boost supports prompts.

diff --git a/packages/core/src/routines/driver/ExecuteCommandRoutine.ts b/packages/core/src/routines/driver/ExecuteCommandRoutine.ts
@@ -189,7 +189,7 @@ export class ExecuteCommandRoutine extends Routine<unknown, unknown, ExecuteComm
 				nativeOptions[option] = true;
 			});
 
-			return Promise.resolve(nativeOptions);
+			return nativeOptions;
 		}
 
 		this.debug('Extracting native options from help output');

diff --git a/packages/driver-typescript/package.json b/packages/driver-typescript/package.json
@@ -38,7 +38,7 @@
   },
   "devDependencies": {
     "@boost/test-utils": "^3.0.0",
-    "typescript": "^4.5.4"
+    "typescript": "^4.6.2"
   },
   "peerDependencies": {
     "@beemo/core": "^2.0.0",

diff --git a/packages/driver-typescript/tests/commands/syncProjectRefs.test.ts b/packages/driver-typescript/tests/commands/syncProjectRefs.test.ts
@@ -305,6 +305,7 @@ describe('syncProjectRefs()', () => {
 
 	it('emits `onCreateProjectConfigFile` event', async () => {
 		const spy = jest.fn((filePath, config, isTests) => {
+			// eslint-disable-next-line jest/no-conditional-in-test
 			if (isTests) {
 				// eslint-disable-next-line no-param-reassign
 				config.compilerOptions.testsOnly = true;

diff --git a/packages/local/package.json b/packages/local/package.json
@@ -32,7 +32,7 @@
     "@beemo/driver-webpack": "*"
   },
   "devDependencies": {
-    "@beemo/dev": "^1.7.4",
+    "@beemo/dev": "^1.7.8",
     "chalk": "^4.1.2",
     "execa": "^5.1.1",
     "fast-glob": "^3.2.7",

diff --git a/packages/local/src/scripts/RunIntegrationTests.ts b/packages/local/src/scripts/RunIntegrationTests.ts
@@ -39,7 +39,7 @@ class RunIntegrationTestsScript extends Script<RunIntegrationTestsOptions> {
 		if (!script) {
 			console.warn(`Script "integration:${type}" has not been defined for ${name}, skipping.`);
 
-			return Promise.resolve();
+			return undefined;
 		}
 
 		console.log('Testing %s - %s', chalk.yellow(pkg.name), script);