@enact/cli 6.0.0 → 6.0.2

package/.travis.yml

@@ -1,7 +1,7 @@
 dist: focal
 language: node_js
 node_js:
-    - "19"
+    - node
 sudo: false
 install:
     - npm config set prefer-offline false

package/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 6.0.2 (July 26, 2023)
+
+* Updated `chalk` version to `^5.3.0`.
+* Updated `find-cache-dir` version to `^7.1.0`.
+
+## 6.0.1 (July 4, 2023)
+
+* Updated dependencies.
+
 ## 6.0.0 (May 19, 2023)
 
 * Updated all dependencies to the latest including Jest 29 and Typescript 5.

package/README.md

@@ -1,4 +1,4 @@
-# @enact/cli [![Travis](https://img.shields.io/travis/enactjs/cli/master.svg?style=flat-square)](https://travis-ci.org/enactjs/cli) [![NPM](https://img.shields.io/npm/v/@enact/cli.svg?style=flat-square)](https://www.npmjs.com/package/@enact/cli)
+# @enact/cli [![Travis](https://img.shields.io/travis/com/enactjs/cli/master?style=flat-square)](https://app.travis-ci.com/github/enactjs/cli) [![NPM](https://img.shields.io/npm/v/@enact/cli.svg?style=flat-square)](https://www.npmjs.com/package/@enact/cli)
 
 > A standalone toolkit for rapid Enact app development.
 
@@ -9,7 +9,7 @@ All that's needed to install @enact/cli is to use npm to install it globally. Fo
 npm install -g @enact/cli
 ```
 
->Note: Node 10 LTS or greater required.
+>Note: Node 16 or greater required.
 
 ## Creating a new App
 
@@ -65,7 +65,8 @@ The @enact/cli tool will check the project's **package.json** looking for an opt
 * `alias` _[object]_ - String mapping of webpack alias paths to use when building.
 * `theme` _[object]_ - A simplified string name to extrapolate `fontGenerator`, `ri`, and `screenTypes` preset values from. For example, `"sandstone"`.
 * `fontGenerator` _[string]_ - Filepath to a CommonJS fontGenerator module which will build locale-specific font CSS to inject into the HTML. By default, will use any preset for a specified theme or fallback to sandstone.
-* `ri` _[object]_ - Resolution independence options to be forwarded to the [LESS plugin](https://github.com/enactjs/less-plugin-resolution-independence). By default, will use any preset for a specified theme or fallback to sandstone.
+* `ri` _[object]_ - Resolution independence options to be forwarded to the [postcss-resolution-independence](https://github.com/enactjs/postcss-resolution-independence). By default, will use any preset for a specified theme or fallback to sandstone.
+	* `baseSize` _[number]_ - The root font-size to use when converting the value of the base unit to a resolution-independent unit. For example, when `baseSize` is set to 24, 48px in the LESS file will be converted to 2rem.
 * `screenTypes` _[array|string]_ - Array of 1 or more screentype definitions to be used with prerender HTML initialization. Can alternatively reference a json filepath to read for screentype definitions.  By default, will use any preset for a specified theme or fallback to sandstone.
 * `nodeBuiltins` _[object]_ - Configuration settings for polyfilling NodeJS built-ins. See `node` [webpack option](https://webpack.js.org/configuration/node/).
 * `resolveFallback` _[object]_ - Configuration settings for redirecting module requests when normal resolving fails. See `resolve.fallback` [webpack option](https://webpack.js.org/configuration/resolve/#resolvefallback).
@@ -94,7 +95,7 @@ For example:
 
 ## Displaying Lint Output in the Editor
 
-Some editors, including Sublime Text, Atom, and Visual Studio Code, provide plugins for ESLint.
+Some editors, including Visual Studio Code, Sublime Text, and Atom provide plugins for ESLint.
 
 They are not required for linting. You should see the linter output right in your terminal. However, if you prefer the lint results to appear right in your editor, there are some extra steps you can do.
 
@@ -130,6 +131,9 @@ Then, you will need to uninstall any previous globally-installed Enact linting p
 npm uninstall -g eslint-plugin-react eslint-plugin-react-hooks eslint-plugin-babel @babel/eslint-parser eslint-plugin-jest eslint-plugin-enact eslint-config-enact
 ```
 
+## Documentation
+* [Enact CLI Development Tool](https://enactjs.com/docs/developer-tools/cli/)
+
 ## Copyright and License Information
 
 Unless otherwise specified, all content, including all source code files and documentation files in this repository are:

package/bin/enact.js

@@ -2,7 +2,6 @@
 
 'use strict';
 
-const chalk = require('chalk');
 const semver = require('semver');
 const pkg = require('../package.json');
 
@@ -14,11 +13,13 @@ if (
 		pkg.engines.node
 	)
 ) {
-	console.log(
-		chalk.red(`You are running Node ${process.version}, but @enact/cli requires Node ${pkg.engines.node}.\n`) +
-			chalk.bold.red('Please update your version of Node.')
-	);
-	process.exit(1);
+	import('chalk').then(({default: chalk}) => {
+		console.log(
+			chalk.red(`You are running Node ${process.version}, but @enact/cli requires Node ${pkg.engines.node}.\n`) +
+				chalk.bold.red('Please update your version of Node.')
+		);
+		process.exit(1);
+	});
 }
 
 // Uncaught error handler
@@ -29,8 +30,9 @@ if (process.platform === 'win32' && process.title === 'Windows PowerShell ISE')
 
 // Handle tasks/arguments
 if (process.argv.indexOf('-v') >= 0 || process.argv.indexOf('--version') >= 0) {
-	// Enact-CLI ascii art title
-	const title = `                                               
+	import('chalk').then(({default: chalk}) => {
+		// Enact-CLI ascii art title
+		const title = `                                               
     ┌─┐┌┐┌┌─┐┌─┐┌┬┐  ┌─┐┬  ┬    ▐██▄▄    ▄▄██▌ 
     │  ││││ ││   │   │  │  │    ▐██▀██████▀▀   
     ├┤ │││├─┤│   │ ──│  │  │    ▐██▄▄ ▀▀ ▄▄    
@@ -38,21 +40,24 @@ if (process.argv.indexOf('-v') >= 0 || process.argv.indexOf('--version') >= 0) {
     └─┘┘└┘┴ ┴└─┘ ┴   └─┘┴─┘┴    ▐██▄▄ ▀▀ ▄▄██▌ 
     ────────────────────────      ▀▀██████▀▀   
                                       ▀▀       `;
-	// Add colour to the logo
-	const colourTitle = title
-		.split(/[\n\r]+/g)
-		.map(l => {
-			const half = (l.length - 31) / 2;
-			return (
-				l.substring(0, 31) +
-				chalk.bgBlueBright(chalk.whiteBright(l.substring(31, 31 + half)) + chalk.white(l.substring(31 + half)))
-			);
-		})
-		.join('\n');
-	console.log();
-	console.log(colourTitle);
-	console.log('    Version ' + pkg.version);
-	console.log();
+		// Add colour to the logo
+		const colourTitle = title
+			.split(/[\n\r]+/g)
+			.map(l => {
+				const half = (l.length - 31) / 2;
+				return (
+					l.substring(0, 31) +
+					chalk.bgBlueBright(
+						chalk.whiteBright(l.substring(31, 31 + half)) + chalk.white(l.substring(31 + half))
+					)
+				);
+			})
+			.join('\n');
+		console.log();
+		console.log(colourTitle);
+		console.log('    Version ' + pkg.version);
+		console.log();
+	});
 } else {
 	const command = process.argv[2];
 
@@ -75,25 +80,27 @@ if (process.argv.indexOf('-v') >= 0 || process.argv.indexOf('--version') >= 0) {
 			break;
 		}
 		default: {
-			console.log('  Usage');
-			console.log('    enact <command> [...]');
-			console.log();
-			console.log('  Commands');
-			console.log('    create            Create a new project');
-			console.log('    link              Link @enact dependencies');
-			console.log('    bootstrap         Install and link dependencies');
-			console.log('    serve             Development server');
-			console.log('    pack              Bundle source code');
-			console.log('    test              Test specs runner');
-			console.log('    transpile         Transpile to ES5');
-			console.log('    template          Manage Enact templates');
-			console.log('    license           Detect all used licenses');
-			console.log('    lint              Lint source code');
-			console.log('    clean             Clean build directory');
-			console.log('    eject             Eject to standalone app');
-			console.log();
-			console.log(`  Refer to each command's ${chalk.cyan('--help')} for more details.`);
-			console.log();
+			import('chalk').then(({default: chalk}) => {
+				console.log('  Usage');
+				console.log('    enact <command> [...]');
+				console.log();
+				console.log('  Commands');
+				console.log('    create            Create a new project');
+				console.log('    link              Link @enact dependencies');
+				console.log('    bootstrap         Install and link dependencies');
+				console.log('    serve             Development server');
+				console.log('    pack              Bundle source code');
+				console.log('    test              Test specs runner');
+				console.log('    transpile         Transpile to ES5');
+				console.log('    template          Manage Enact templates');
+				console.log('    license           Detect all used licenses');
+				console.log('    lint              Lint source code');
+				console.log('    clean             Clean build directory');
+				console.log('    eject             Eject to standalone app');
+				console.log();
+				console.log(`  Refer to each command's ${chalk.cyan('--help')} for more details.`);
+				console.log();
+			});
 		}
 	}
 }

package/commands/bootstrap.js

@@ -1,12 +1,13 @@
 // @remove-file-on-eject
 const path = require('path');
-const chalk = require('chalk');
 const spawn = require('cross-spawn');
 const fs = require('fs-extra');
 const minimist = require('minimist');
 const packageRoot = require('@enact/dev-utils').packageRoot;
 const doLink = require('./link').api;
 
+let chalk;
+
 function displayHelp() {
 	let e = 'node ' + path.relative(process.cwd(), __filename);
 	if (require.main !== module) e = 'enact bootstrap';
@@ -175,9 +176,12 @@ function cli(args) {
 
 	if (opts._[0] && fs.statSync(opts._[0]).isDirectory()) opts.cwd = opts._[0];
 
-	api(opts).catch(err => {
-		console.error(chalk.red('ERROR: ') + err.message);
-		process.exit(1);
+	import('chalk').then(({default: _chalk}) => {
+		chalk = _chalk;
+		api(opts).catch(err => {
+			console.error(chalk.red('ERROR: ') + err.message);
+			process.exit(1);
+		});
 	});
 }
 

package/commands/clean.js

@@ -1,10 +1,11 @@
 /* eslint-env node, es6 */
 const path = require('path');
-const chalk = require('chalk');
 const fs = require('fs-extra');
 const minimist = require('minimist');
 const packageRoot = require('@enact/dev-utils').packageRoot;
 
+let chalk;
+
 const build = 'build';
 const dist = 'dist';
 const node_modules = 'node_modules';
@@ -57,9 +58,12 @@ function cli(args) {
 	if (opts.help) displayHelp();
 
 	process.chdir(packageRoot().path);
-	api({paths: opts._, all: opts.all}).catch(err => {
-		console.error(chalk.red('ERROR: ') + 'Failed to clean project.\n' + err.message);
-		process.exit(1);
+	import('chalk').then(({default: _chalk}) => {
+		chalk = _chalk;
+		api({paths: opts._, all: opts.all}).catch(err => {
+			console.error(chalk.red('ERROR: ') + 'Failed to clean project.\n' + err.message);
+			process.exit(1);
+		});
 	});
 }
 

package/commands/create.js

@@ -11,12 +11,13 @@
  */
 const os = require('os');
 const path = require('path');
-const chalk = require('chalk');
 const spawn = require('cross-spawn');
 const fs = require('fs-extra');
 const minimist = require('minimist');
 const validatePackageName = require('validate-npm-package-name');
 
+let chalk;
+
 const ENACT_DEV_NPM = '@enact/cli';
 const INCLUDED = path.dirname(require.resolve('@enact/template-sandstone'));
 const TEMPLATE_DIR = path.join(process.env.APPDATA || os.homedir(), '.enact');
@@ -283,9 +284,12 @@ function cli(args) {
 	opts.directory = path.resolve(typeof opts._[0] !== 'undefined' ? opts._[0] + '' : process.cwd());
 	opts.name = path.basename(opts.directory).replace(/ /g, '-').toLowerCase();
 
-	api(opts).catch(err => {
-		console.error(chalk.red('ERROR: ') + err.message);
-		process.exit(1);
+	import('chalk').then(({default: _chalk}) => {
+		chalk = _chalk;
+		api(opts).catch(err => {
+			console.error(chalk.red('ERROR: ') + err.message);
+			process.exit(1);
+		});
 	});
 }
 

package/commands/eject.js

@@ -12,13 +12,14 @@
 const cp = require('child_process');
 const os = require('os');
 const path = require('path');
-const chalk = require('chalk');
 const fs = require('fs-extra');
 const prompts = require('prompts');
 const minimist = require('minimist');
 const {packageRoot} = require('@enact/dev-utils');
 const spawn = require('cross-spawn');
 
+let chalk;
+
 const assets = [
 	{src: path.join(__dirname, '..', 'config'), dest: 'config'},
 	{src: path.join(__dirname, '..', 'config', 'jest'), dest: 'config/jest'},
@@ -303,9 +304,12 @@ function cli(args) {
 
 	process.chdir(packageRoot().path);
 
-	api({bare: opts.bare}).catch(err => {
-		console.error(chalk.red('ERROR: ') + err.message);
-		process.exit(1);
+	import('chalk').then(({default: _chalk}) => {
+		chalk = _chalk;
+		api({bare: opts.bare}).catch(err => {
+			console.error(chalk.red('ERROR: ') + err.message);
+			process.exit(1);
+		});
 	});
 }
 

package/commands/info.js

@@ -1,11 +1,12 @@
 /* eslint-env node, es6 */
 const path = require('path');
 const fs = require('fs');
-const chalk = require('chalk');
 const spawn = require('cross-spawn');
 const minimist = require('minimist');
 const resolveSync = require('resolve').sync;
 
+let chalk;
+
 function displayHelp() {
 	let e = 'node ' + path.relative(process.cwd(), __filename);
 	if (require.main !== module) e = 'enact info';
@@ -167,9 +168,12 @@ function cli(args) {
 	});
 	if (opts.help) displayHelp();
 
-	api({cliInfo: opts.cli, dev: opts.dev}).catch(err => {
-		console.error(chalk.red('ERROR: ') + 'Failed to display info.\n' + err.message);
-		process.exit(1);
+	import('chalk').then(({default: _chalk}) => {
+		chalk = _chalk;
+		api({cliInfo: opts.cli, dev: opts.dev}).catch(err => {
+			console.error(chalk.red('ERROR: ') + 'Failed to display info.\n' + err.message);
+			process.exit(1);
+		});
 	});
 }
 

package/commands/license.js

@@ -1,9 +1,10 @@
 /* eslint-env node, es6 */
 const path = require('path');
-const chalk = require('chalk');
 const checker = require('license-checker');
 const minimist = require('minimist');
 
+let chalk;
+
 // The following modules reside in `@enact/cli` but end up in production builds of apps
 const pkgPathResolve = m => path.dirname(require.resolve(m + '/package.json'));
 const enactCLIProdModules = ['@babel/core', 'core-js'].map(pkgPathResolve);
@@ -53,12 +54,15 @@ function cli(args) {
 	});
 	if (opts.help) displayHelp();
 
-	api({modules: opts._})
-		.then(licenses => console.log(JSON.stringify(licenses, null, 2)))
-		.catch(err => {
-			console.error(chalk.red('ERROR: ') + err.message);
-			process.exit(1);
-		});
+	import('chalk').then(({default: _chalk}) => {
+		chalk = _chalk;
+		api({modules: opts._})
+			.then(licenses => console.log(JSON.stringify(licenses, null, 2)))
+			.catch(err => {
+				console.error(chalk.red('ERROR: ') + err.message);
+				process.exit(1);
+			});
+	});
 }
 
 module.exports = {api, cli};

package/commands/link.js

@@ -1,11 +1,12 @@
 // @remove-file-on-eject
 const path = require('path');
-const chalk = require('chalk');
 const spawn = require('cross-spawn');
 const fs = require('fs-extra');
 const minimist = require('minimist');
 const packageRoot = require('@enact/dev-utils').packageRoot;
 
+let chalk;
+
 function displayHelp() {
 	let e = 'node ' + path.relative(process.cwd(), __filename);
 	if (require.main !== module) e = 'enact link';
@@ -94,9 +95,12 @@ function cli(args) {
 
 	if (opts._[0]) opts.cwd = opts._[0];
 
-	api(opts).catch(err => {
-		console.error(chalk.red('ERROR: ') + err.message);
-		process.exit(1);
+	import('chalk').then(({default: _chalk}) => {
+		chalk = _chalk;
+		api(opts).catch(err => {
+			console.error(chalk.red('ERROR: ') + err.message);
+			process.exit(1);
+		});
 	});
 }
 

package/commands/pack.js

@@ -12,16 +12,17 @@
  */
 // @remove-on-eject-end
 const path = require('path');
-const chalk = require('chalk');
 const {filesize} = require('filesize');
 const fs = require('fs-extra');
 const minimist = require('minimist');
 const formatWebpackMessages = require('react-dev-utils/formatWebpackMessages');
 const printBuildError = require('react-dev-utils/printBuildError');
-const stripAnsi = require('strip-ansi');
 const webpack = require('webpack');
 const {optionParser: app, mixins, configHelper: helper} = require('@enact/dev-utils');
 
+let chalk;
+let stripAnsi;
+
 function displayHelp() {
 	let e = 'node ' + path.relative(process.cwd(), __filename);
 	if (require.main !== module) e = 'enact pack';
@@ -315,9 +316,15 @@ function cli(args) {
 	if (opts.help) displayHelp();
 
 	process.chdir(app.context);
-	api(opts).catch(err => {
-		printErrorDetails(err, () => {
-			process.exit(1);
+	import('chalk').then(({default: _chalk}) => {
+		chalk = _chalk;
+		import('strip-ansi').then(({default: _stripAnsi}) => {
+			stripAnsi = _stripAnsi;
+			api(opts).catch(err => {
+				printErrorDetails(err, () => {
+					process.exit(1);
+				});
+			});
 		});
 	});
 }

package/commands/serve.js

@@ -13,7 +13,6 @@
 // @remove-on-eject-end
 const fs = require('fs');
 const path = require('path');
-const chalk = require('chalk');
 const minimist = require('minimist');
 const clearConsole = require('react-dev-utils/clearConsole');
 const evalSourceMapMiddleware = require('react-dev-utils/evalSourceMapMiddleware');
@@ -27,6 +26,8 @@ const webpack = require('webpack');
 const WebpackDevServer = require('webpack-dev-server');
 const {optionParser: app} = require('@enact/dev-utils');
 
+let chalk;
+
 // Any unhandled promise rejections should be treated like errors.
 process.on('unhandledRejection', err => {
 	throw err;
@@ -355,10 +356,13 @@ function cli(args) {
 
 	process.chdir(app.context);
 
-	api(opts).catch(err => {
-		//console.error(chalk.red('ERROR: ') + (err.message || err));
-		console.log(err);
-		process.exit(1);
+	import('chalk').then(({default: _chalk}) => {
+		chalk = _chalk;
+		api(opts).catch(err => {
+			//console.error(chalk.red('ERROR: ') + (err.message || err));
+			console.log(err);
+			process.exit(1);
+		});
 	});
 }
 

package/commands/template.js

@@ -2,13 +2,14 @@
 const os = require('os');
 const path = require('path');
 const url = require('url');
-const chalk = require('chalk');
 const spawn = require('cross-spawn');
 const fs = require('fs-extra');
 const minimist = require('minimist');
 const prompts = require('prompts');
 const tar = require('tar');
 
+let chalk;
+
 const TEMPLATE_DIR = path.join(process.env.APPDATA || os.homedir(), '.enact');
 const INCLUDED = path.dirname(require.resolve('@enact/template-sandstone'));
 const DEFAULT_LINK = path.join(TEMPLATE_DIR, 'default');
@@ -300,11 +301,14 @@ function cli(args) {
 	const name = ['install', 'link'].includes(action) ? opts._[2] : opts._[1];
 	if (!action) displayHelp();
 
-	api({action, name, target}).catch(err => {
-		console.error('Template action failed.');
-		console.error();
-		console.error(chalk.red('ERROR: ') + err.message);
-		process.exit(1);
+	import('chalk').then(({default: _chalk}) => {
+		chalk = _chalk;
+		api({action, name, target}).catch(err => {
+			console.error('Template action failed.');
+			console.error();
+			console.error(chalk.red('ERROR: ') + err.message);
+			process.exit(1);
+		});
 	});
 }
 

package/commands/test.js

@@ -14,10 +14,11 @@
 const path = require('path');
 const {execSync} = require('child_process');
 const {packageRoot} = require('@enact/dev-utils');
-const chalk = require('chalk');
 const jest = require('jest');
 const resolve = require('resolve');
 
+let chalk;
+
 // Makes the script crash on unhandled rejections instead of silently
 // ignoring them. In the future, promise rejections that are not handled will
 // terminate the Node.js process with a non-zero exit code.
@@ -171,8 +172,11 @@ function api(args = []) {
 }
 
 function cli(args) {
-	api(args).catch(() => {
-		process.exit(1);
+	import('chalk').then(({default: _chalk}) => {
+		chalk = _chalk;
+		api(args).catch(() => {
+			process.exit(1);
+		});
 	});
 }
 

package/commands/transpile.js

@@ -1,7 +1,6 @@
 // @remove-file-on-eject
 const path = require('path');
 const babel = require('@babel/core');
-const chalk = require('chalk');
 const fs = require('fs-extra');
 const less = require('less');
 const LessPluginResolve = require('less-plugin-npm-import');
@@ -9,6 +8,8 @@ const minimist = require('minimist');
 const LessPluginRi = require('resolution-independence');
 const {optionParser: app} = require('@enact/dev-utils');
 
+let chalk;
+
 const blacklist = ['node_modules', 'build', 'dist', 'docs', '.git', '.gitignore', 'samples', 'tests'];
 const babelConfig = path.join(__dirname, '..', 'config', 'babel.config.js');
 const babelRename = {original: '^(\\.(?!.*\\bstyles\\b.*).*)\\.less$', replacement: '$1.css'};
@@ -103,8 +104,11 @@ function cli(args) {
 	process.chdir(app.context);
 	console.log('Transpiling via Babel to ' + path.resolve(opts.output));
 
-	api({source: '.', output: opts.output, commonjs: opts.commonjs, ignore}).catch(err => {
-		console.error(chalk.red('ERROR: ') + err.message);
+	import('chalk').then(({default: _chalk}) => {
+		chalk = _chalk;
+		api({source: '.', output: opts.output, commonjs: opts.commonjs, ignore}).catch(err => {
+			console.error(chalk.red('ERROR: ') + err.message);
+		});
 	});
 }