Merge pull request #542 from izaera/issue-520

feat: Prepare a new snapshot version to integrate in Portal's build

Author: izaera

.eslintrc.js

@@ -18,6 +18,7 @@ module.exports = {
 	root: true,
 	rules: {
 		'@typescript-eslint/await-thenable': 'error',
+		'@typescript-eslint/switch-exhaustiveness-check': 'error',
 		'@typescript-eslint/no-explicit-any': [
 			'error',
 			{

.gitignore

@@ -1,4 +1,5 @@
 node_modules/*
 packages/*/generators
 packages/*/lib
-packages/*/node_modules
+packages/*/node_modules
+tsconfig.tsbuildinfo

jest.config.js

@@ -12,7 +12,6 @@ module.exports = {
 	],
 	testPathIgnorePatterns: ['/node_modules/', '/__fixtures__/'],
 	transform: {
-		"\\.js$": "ts-jest",
-		"\\.ts$": "ts-jest"
-	}
+		'\\.ts$': 'ts-jest',
+	},
 };

package.json

@@ -13,17 +13,18 @@
 		"packages/*"
 	],
 	"scripts": {
-		"build": "node scripts/build.js",
+		"build": "tsc --build packages/*/tsconfig.json && yarn workspaces run copyfiles",
 		"check-deps": "node scripts/check-deps.js",
-		"ci": "yarn check-deps && yarn format:check && yarn lint && yarn build && yarn test",
+		"ci": "yarn clean && yarn check-deps && yarn format:check && yarn lint && yarn build && yarn test",
+		"clean": "yarn workspaces run clean",
 		"format": "prettier --write \".*.ts\" \"packages/**/*.ts\"",
 		"format:check": "prettier --list-different \".*.ts\" \"packages/**/*.ts\"",
 		"level-deps": "node scripts/level-deps.js",
 		"lint": "eslint .",
 		"lint:fix": "eslint --fix .",
 		"qa": "node scripts/qa/index.js",
 		"test": "jest --runInBand",
-		"watch": "node scripts/watch"
+		"watch": "node scripts/watch.js"
 	},
 	"devDependencies": {
 		"@types/jest": "^24.0.18",

packages/generator-liferay-js/package.json

@@ -2,6 +2,7 @@
 	"name": "generator-liferay-js",
 	"version": "3.0.0",
 	"description": "Yeoman generators for Liferay DXP and Portal CE JavaScript projects.",
+	"license": "LGPL-3.0",
 	"main": "generators/app/index.js",
 	"files": [
 		"generators"
@@ -12,11 +13,13 @@
 		"liferay-js"
 	],
 	"scripts": {
-		"copyfiles": "node ../../scripts/copyfiles.js",
 		"build": "tsc && yarn copyfiles",
+		"clean": "node ../../scripts/clean.js",
+		"copyfiles": "node ../../scripts/copyfiles.js",
 		"prepublish": "yarn build"
 	},
 	"devDependencies": {
+		"@types/yeoman-generator": "^3.1.4",
 		"mem-fs": "^1.1.3",
 		"mem-fs-editor": "^6.0.0",
 		"rimraf": "^3.0.0"

packages/generator-liferay-js/src/adapt/index.js renamed to packages/generator-liferay-js/src/adapt/index.ts

@@ -4,8 +4,8 @@
  */
 
 import {
-	info,
 	error,
+	info,
 	print,
 	success,
 	title,
@@ -109,6 +109,9 @@ if (argv.which) {
  * Generator to add deploy support to projects.
  */
 export default class extends Generator {
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any
+	answers: any;
+
 	/**
 	 * Standard Yeoman constructor
 	 */
@@ -182,7 +185,8 @@ export default class extends Generator {
 			]);
 
 			// Set project's package manager internally using a hack
-			project._pkgManager = answers.pkgManager;
+			// eslint-disable-next-line @typescript-eslint/no-explicit-any
+			(project as any)._pkgManager = answers.pkgManager;
 		}
 
 		Object.assign(
@@ -352,6 +356,10 @@ export default class extends Generator {
 
 		pkgJson.addPortletProperty('com.liferay.portlet.instanceable', true);
 	}
+
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any
+	private _options: any;
+	private _pkgManager: string;
 }
 
 module.exports = exports['default'];

packages/generator-liferay-js/src/app/index.js renamed to packages/generator-liferay-js/src/app/index.ts

@@ -1,6 +1,5 @@
 /**
- * © 2017 Liferay, Inc. <https://liferay.com>
- *
+ * SPDX-FileCopyrightText: © 2017 Liferay, Inc. <https://liferay.com>
  * SPDX-License-Identifier: LGPL-3.0-or-later
  */
 
@@ -44,7 +43,10 @@ export default class extends Generator {
 		]);
 
 		this.destinationRoot(path.resolve(answers.folder));
-		this.composeWith(require.resolve(`../target-${answers.target}`));
+		this.composeWith(
+			require.resolve(`../target-${answers.target}`),
+			undefined
+		);
 	}
 
 	/**
@@ -55,7 +57,7 @@ export default class extends Generator {
 	_findTargets() {
 		const tds = fs
 			.readdirSync(path.join(__dirname, '..'))
-			.filter(file => file.indexOf('target-') == 0)
+			.filter(file => file.indexOf('target-') === 0)
 			.map(target => target.replace('target-', ''))
 			.map(target => ({
 				...getTargetDescription(target),
@@ -91,6 +93,7 @@ export default class extends Generator {
 	_getTargetCategories(tds) {
 		const map = tds.reduce((map, td) => {
 			map[td.category] = true;
+
 			return map;
 		}, {});
 

packages/generator-liferay-js/src/config.js renamed to packages/generator-liferay-js/src/config.ts

@@ -7,7 +7,8 @@ import os from 'os';
 import path from 'path';
 import readJsonSync from 'read-json-sync';
 
-let cfg = {};
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+let cfg: any = {};
 
 Object.assign(
 	cfg,
@@ -101,6 +102,7 @@ function safeReadJsonSync(path) {
 		if (err.code !== 'ENOENT') {
 			throw err;
 		}
+
 		return {};
 	}
 }

packages/generator-liferay-js/src/facet-configuration/constants.js renamed to packages/generator-liferay-js/src/facet-configuration/constants.ts

@@ -16,6 +16,9 @@ import {DEFAULT_CONFIGURATION} from './constants';
  * Generator to add configuration support to projects.
  */
 export default class extends Generator {
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any
+	answers: any;
+
 	/**
 	 * Standard Yeoman initialization function
 	 */