@enact/cli 3.0.3 → 3.0.8

package/.github/workflows/update-copyright-years.yml

@@ -0,0 +1,23 @@
+name: Update copyright year(s) in license file
+
+on:
+  schedule:
+    - cron: "0 7 1 1 *"
+
+jobs:
+  run:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        ref: develop
+        fetch-depth: 0
+    - uses: FantasticFiasco/action-update-license-year@v2
+      with:
+        token: ${{ secrets.GITHUB_TOKEN }}
+        path: README.md
+        branchName: license/{{currentYear}}
+        commitTitle: update license
+        commitBody: Let's keep legal happy.
+        prTitle: Update copyright years in README.md file
+        prBody: It's that time of the year, let's update the license.

package/CHANGELOG.md

@@ -1,10 +1,45 @@
+## 3.0.8 (February 17, 2022)
+
+* No significant changes.
+
+## 3.0.7 (February 17, 2022)
+
+### pack
+
+* Updated `postcss` related dependencies including `postcss-normalize` 10.0.1.
+
+## 3.0.6 (May 11, 2021)
+
+### pack
+
+* Fixed not inserting title into the output HTML.
+
+## 3.0.5 (February 3, 2021)
+
+### serve
+
+* Fixed https serve is not working.
+
+### eject
+
+* Fixed `--bare` option to work.
+
+## 3.0.4 (August 10, 2020)
+
+### create
+
+* Switched back to `@enact/template-moonstone` as default templated included in CLI.
+
+### template
+
+* Fixed error being thrown when dead symlinks are detected in template userspace.
+
 ## 3.0.3 (August 5, 2020)
 
 ### transpile
 
 * When transpiling in standalone mode, do not use `@babel/plugin-transform-runtime`.
 
-
 ## 3.0.2 (August 3, 2020)
 
 ### pack
@@ -111,7 +146,7 @@ All dependencies updated to latest release.
 ### pack
 
 * Fixed theme feature detection on local theme files (eg. when a local ThemeDecorator is present)
-* Fixed bug with `--framework` option with regards to erroneously including unneeded or invalid iLib dependencies and test files. 
+* Fixed bug with `--framework` option with regards to erroneously including unneeded or invalid iLib dependencies and test files.
 
 ### clean
 

package/README.md

@@ -116,7 +116,7 @@ npm install -g eslint@5 eslint-plugin-react eslint-plugin-react-hooks eslint-plu
 
 Unless otherwise specified, all content, including all source code files and documentation files in this repository are:
 
-Copyright (c) 2016-2020 LG Electronics
+Copyright (c) 2016-2021 LG Electronics
 
 Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at
 

package/commands/bootstrap.js

@@ -27,6 +27,11 @@ function displayHelp() {
 	console.log('    -v, --version     Display version information');
 	console.log('    -h, --help        Display help information');
 	console.log();
+	/*
+		Private Options:
+			--override            Directory containing package .tgz archives to override dependencies.
+	*/
+
 	process.exit(0);
 }
 
@@ -55,6 +60,7 @@ function api({
 	allsamples = false,
 	link = true,
 	loglevel = 'error',
+	override,
 	verbose = false
 } = {}) {
 	const pkg = packageRoot(cwd);
@@ -62,6 +68,51 @@ function api({
 	if (verbose) loglevel = 'verbose';
 
 	return Promise.resolve()
+		.then(() => {
+			// Override dependencies in package.json, package-lock.json and npm-shrinkwrap.json
+			if (override) {
+				console.log('Overrides with local dependencies from', override);
+				// Collect list of all valid local package tgz archives found
+				const scoped = s => fs.readdirSync(path.join(override, s)).map(d => path.join(s, d));
+				const local = fs
+					.readdirSync(override)
+					.reduce((a, curr) => a.concat(curr.startsWith('@') ? scoped(curr) : curr), [])
+					.filter(d => fs.existsSync(path.join(override, d, 'package.tgz')));
+				if (path.isAbsolute(override)) override = path.relative(cwd, override);
+				['package.json', 'package-lock.json', 'npm-shrinkwrap.json']
+					.map(f => path.join(cwd, f))
+					.filter(f => fs.existsSync(f))
+					.forEach((f, i) => {
+						const lockfile = i > 0;
+						// Restore any detected backups
+						if (fs.existsSync(f + '.bak')) {
+							fs.unlinkSync(f);
+							fs.renameSync(f + '.bak', f);
+						}
+						const obj = JSON.parse(fs.readFileSync(f, {encoding: 'utf8'}));
+						// Update dependency entry for local entries that exist
+						local
+							.filter(dep => obj.dependencies && obj.dependencies[dep])
+							.forEach(dep => {
+								const fileDep = 'file:' + path.join(override, dep, 'package.tgz');
+								if (lockfile) {
+									obj.lockfileVersion = obj.lockfileVersion || 1;
+									obj.requires = true;
+									obj.dependencies[dep].version = fileDep;
+									// Remove unneeded properties to avoid issues
+									['resolved', 'from', 'integrity', 'requires'].forEach(
+										key => delete obj.dependencies[dep][key]
+									);
+								} else {
+									obj.dependencies[dep] = fileDep;
+								}
+							});
+						// Backup existing and write the newly modified file
+						fs.renameSync(f, f + '.bak');
+						fs.writeFileSync(f, JSON.stringify(obj, null, '  '), {encoding: 'utf8'});
+					});
+			}
+		})
 		.then(() => {
 			// Root package install
 			if (base) {
@@ -116,12 +167,14 @@ function api({
 function cli(args) {
 	const opts = minimist(args, {
 		boolean: ['base', 'sampler', 'allsamples', 'link', 'verbose', 'help'],
-		string: ['loglevel'],
+		string: ['loglevel', 'override'],
 		default: {base: true, sampler: true, link: true},
 		alias: {b: 'base', s: 'sampler', a: 'allsamples', l: 'link', h: 'help'}
 	});
 	if (opts.help) displayHelp();
 
+	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);

package/commands/create.js

@@ -18,7 +18,7 @@ const minimist = require('minimist');
 const validatePackageName = require('validate-npm-package-name');
 
 const ENACT_DEV_NPM = '@enact/cli';
-const INCLUDED = path.dirname(require.resolve('@enact/template-sandstone'));
+const INCLUDED = path.dirname(require.resolve('@enact/template-moonstone'));
 const TEMPLATE_DIR = path.join(process.env.APPDATA || os.homedir(), '.enact');
 
 const defaultGenerator = {
@@ -170,7 +170,7 @@ function resolveTemplateGenerator(template) {
 	return new Promise((resolve, reject) => {
 		let templatePath = path.join(TEMPLATE_DIR, template);
 		if (!fs.existsSync(templatePath)) {
-			if (['default', 'sandstone'].includes(template)) {
+			if (['default', 'moonstone'].includes(template)) {
 				templatePath = path.join(INCLUDED, 'template');
 			} else {
 				reject(new Error(`Template ${chalk.bold(template)} not found.`));

package/commands/eject.js

@@ -159,7 +159,7 @@ function configurePackage(bare) {
 	const own = require('../package.json');
 	const app = require(path.resolve('package.json'));
 	const backup = JSON.stringify(app, null, 2) + os.EOL;
-	const availScripts = fs.readdirSync('./scripts').map(f => f.replace(/\.js$/, ''));
+	const availScripts = fs.existsSync('./scripts') ? fs.readdirSync('./scripts').map(f => f.replace(/\.js$/, '')) : [];
 	const enactCLI = new RegExp('enact (' + availScripts.join('|') + ')', 'g');
 	const eslintConfig = {extends: 'enact'};
 	const eslintIgnore = ['build/*', 'config/*', 'dist/*', 'node_modules/*', 'scripts/*'];

package/commands/serve.js

@@ -1,4 +1,5 @@
 /* eslint-env node, es6 */
+/* eslint-disable prettier/prettier */
 // @remove-on-eject-begin
 /**
  * Portions of this source code file are from create-react-app, used under the
@@ -99,7 +100,7 @@ function hotDevServer(config, fastRefresh) {
 function devServerConfig(host, protocol, publicPath, proxy, allowedHost) {
 	let https = false;
 	const {SSL_CRT_FILE, SSL_KEY_FILE} = process.env;
-	if (protocol === 'https' && [SSL_CRT_FILE, SSL_KEY_FILE].all(f => f && fs.existsSync(f))) {
+	if (protocol === 'https' && [SSL_CRT_FILE, SSL_KEY_FILE].every(f => f && fs.existsSync(f))) {
 		https = {
 			cert: fs.readFileSync(SSL_CRT_FILE),
 			key: fs.readFileSync(SSL_KEY_FILE)

package/commands/template.js

@@ -10,7 +10,7 @@ const inquirer = require('react-dev-utils/inquirer');
 const tar = require('tar');
 
 const TEMPLATE_DIR = path.join(process.env.APPDATA || os.homedir(), '.enact');
-const INCLUDED = path.dirname(require.resolve('@enact/template-sandstone'));
+const INCLUDED = path.dirname(require.resolve('@enact/template-moonstone'));
 const DEFAULT_LINK = path.join(TEMPLATE_DIR, 'default');
 
 function displayHelp() {
@@ -58,10 +58,21 @@ function displayHelp() {
 function initTemplateArea() {
 	if (!fs.existsSync(TEMPLATE_DIR)) {
 		fs.mkdirSync(TEMPLATE_DIR);
+	} else {
+		// Remove any dead/unreadable link
+		fs.readdirSync(TEMPLATE_DIR)
+			.map(d => path.join(TEMPLATE_DIR, d))
+			.forEach(d => {
+				try {
+					fs.realpathSync(d);
+				} catch (e) {
+					fs.removeSync(d);
+				}
+			});
 	}
-	const init = doLink(path.join(INCLUDED, 'template'), 'sandstone');
-	const sandstoneLink = path.join(TEMPLATE_DIR, 'sandstone');
-	return init.then(() => !fs.existsSync(DEFAULT_LINK) && doLink(sandstoneLink, 'default'));
+	const init = doLink(path.join(INCLUDED, 'template'), 'moonstone');
+	const moonstoneLink = path.join(TEMPLATE_DIR, 'moonstone');
+	return init.then(() => !fs.existsSync(DEFAULT_LINK) && doLink(moonstoneLink, 'default'));
 }
 
 function doInstall(target, name) {

package/config/webpack.config.js

@@ -91,11 +91,8 @@ module.exports = function (env) {
 				// package.json
 				loader: require.resolve('postcss-loader'),
 				options: {
-					// https://webpack.js.org/guides/migrating/#complex-options
-					ident: 'postcss',
-					sourceMap: shouldUseSourceMap,
-					plugins: () =>
-						[
+					postcssOptions: {
+						plugins: [
 							// Fix and adjust for known flexbox issues
 							// See https://github.com/philipwalton/flexbugs
 							require('postcss-flexbugs-fixes'),
@@ -118,6 +115,8 @@ module.exports = function (env) {
 							// Resolution indepedence support
 							app.ri !== false && require('postcss-resolution-independence')(app.ri)
 						].filter(Boolean)
+					},
+					sourceMap: shouldUseSourceMap
 				}
 			}
 		];
@@ -452,7 +451,7 @@ module.exports = function (env) {
 			new ILibPlugin({symlinks: false}),
 			// Automatically detect ./appinfo.json and ./webos-meta/appinfo.json files,
 			// and parses any to copy over any webOS meta assets at build time.
-			new WebOSMetaPlugin(),
+			new WebOSMetaPlugin({htmlPlugin: HtmlWebpackPlugin}),
 			// TypeScript type checking
 			useTypeScript &&
 				new ForkTsCheckerWebpackPlugin({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@enact/cli",
-  "version": "3.0.3",
+  "version": "3.0.8",
   "description": "Full-featured build environment tool for Enact applications.",
   "main": "index.js",
   "author": "Jason Robitaille <jason.robitaille@lge.com>",
@@ -55,8 +55,8 @@
     "@babel/preset-react": "7.10.4",
     "@babel/preset-typescript": "7.10.4",
     "@babel/runtime": "7.10.5",
-    "@enact/dev-utils": "3.1.0",
-    "@enact/template-sandstone": "1.0.0-pre.1",
+    "@enact/dev-utils": "3.1.2",
+    "@enact/template-moonstone": "3.1.0",
     "@pmmmwh/react-refresh-webpack-plugin": "0.3.3",
     "@typescript-eslint/eslint-plugin": "3.6.0",
     "@typescript-eslint/parser": "3.6.0",
@@ -102,10 +102,11 @@
     "mini-css-extract-plugin": "0.9.0",
     "minimist": "1.2.5",
     "optimize-css-assets-webpack-plugin": "5.0.3",
-    "postcss-flexbugs-fixes": "4.2.1",
+    "postcss": "8.3.5",
+    "postcss-flexbugs-fixes": "5.0.2",
     "postcss-global-import": "1.0.6",
-    "postcss-loader": "3.0.0",
-    "postcss-normalize": "9.0.0",
+    "postcss-loader": "4.2.0",
+    "postcss-normalize": "10.0.1",
     "postcss-preset-env": "6.7.0",
     "postcss-resolution-independence": "1.0.0",
     "postcss-safe-parser": "4.0.2",