style(js-toolkit): make linter happy again

Author: izaera

projects/js-toolkit/packages/portal-adapt-base/src/build.ts

@@ -10,21 +10,21 @@ import runNodeModulesBin from './util/runNodeModulesBin';
 import runPkgJsonScript from './util/runPkgJsonScript';
 
 const {fail, info, print} = format;
-const {ProjectType} = project;
+const {ANGULAR_CLI, CREATE_REACT_APP, VUE_CLI} = project.ProjectType;
 
 const templatesDir = new FilePath(__dirname).join('templates');
 
 export default async function build(): Promise<void> {
 	switch (project.default.probe.type) {
-		case ProjectType.ANGULAR_CLI:
+		case ANGULAR_CLI:
 			await buildWith('build');
 			break;
 
-		case ProjectType.CREATE_REACT_APP:
+		case CREATE_REACT_APP:
 			await buildWith('build');
 			break;
 
-		case ProjectType.VUE_CLI:
+		case VUE_CLI:
 			await buildWith('build', ['--prod=true']);
 			break;
 

projects/js-toolkit/packages/portal-base/src/build.ts

@@ -114,7 +114,7 @@ function runBundler(): void {
 	);
 	const bundlerDir = path.dirname(bundlerPkgJsonPath);
 
-	/* eslint-disable-next-line @liferay/no-dynamic-require */
+	/* eslint-disable-next-line */
 	const bundlerPkgJson = require(bundlerPkgJsonPath);
 	const bundlerPath = path.resolve(
 		bundlerDir,

projects/js-toolkit/packages/portal-base/src/deploy.ts

@@ -25,7 +25,7 @@ export default async function deploy(): Promise<void> {
 		process.exit(1);
 	}
 
-	let deployPath = configuration.get('deploy', 'path');
+	let deployPath = configuration.get('deploy', 'path') as string;
 
 	if (!deployPath) {
 		deployPath = await promptForDeployPath();

projects/js-toolkit/packages/portal-base/src/index.ts

@@ -18,7 +18,10 @@ export interface Tasks {
 	deploy?: {(): Promise<void>};
 }
 
-export default function run(platformPath: string, taskOverrides: Tasks) {
+export default async function run(
+	platformPath: string,
+	taskOverrides: Tasks
+): Promise<void> {
 	if (process.argv.length < 3) {
 		print(fail`No command provided`);
 		process.exit(1);
@@ -35,17 +38,17 @@ export default function run(platformPath: string, taskOverrides: Tasks) {
 			print(
 				title`Building project for target platform: {${pkgJson.name}}`
 			);
-			tasks.build();
+			await tasks.build();
 			break;
 
 		case 'clean':
 			print(title`Cleaning output folders`);
-			tasks.clean();
+			await tasks.clean();
 			break;
 
 		case 'deploy':
 			print(title`Deploying project to Liferay local installation`);
-			tasks.deploy();
+			await tasks.deploy();
 			break;
 
 		default:

projects/js-toolkit/packages/portal-base/src/util/configuration.ts

@@ -7,6 +7,7 @@ import fs from 'fs';
 import project from 'liferay-npm-build-tools-common/lib/project';
 
 export type Command = 'deploy';
+export type ConfigurationValue = boolean | number | object | string;
 
 export interface Configuration {
 	deploy?: {
@@ -17,7 +18,7 @@ export interface Configuration {
 const CONFIGURATION_FILE = '.liferay.json';
 const configuration = load();
 
-export function get(command: Command, key: string) {
+export function get(command: Command, key: string): ConfigurationValue {
 	configuration[command] = configuration[command] || {};
 
 	return configuration[command][key];
@@ -51,7 +52,11 @@ function save(): void {
 	);
 }
 
-export function set(command: Command, key: string, value) {
+export function set(
+	command: Command,
+	key: string,
+	value: ConfigurationValue
+): void {
 	configuration[command] = configuration[command] || {};
 	configuration[command][key] = value;
 

projects/js-toolkit/packages/portal-base/src/util/sassImporter.ts

@@ -7,7 +7,7 @@ import {FilePath} from '@liferay/js-toolkit-core';
 import fs from 'fs';
 import {sync as resolve} from 'resolve';
 
-export default function (url: string) {
+export default function (url: string): {file: string} {
 	const importDir = new FilePath(this.options.file).dirname();
 
 	let targetFile = tryImport(url, (file) => {
@@ -52,7 +52,7 @@ function sassResolve(module: string): string {
 				return undefined;
 			}
 
-			/* eslint-disable-next-line @liferay/no-dynamic-require	*/
+			/* eslint-disable-next-line */
 			const packageJson = require(resolvedPath);
 			const entryPoint = packageJson.style || packageJson.main;