@fontoxml/fontoxml-development-tools 3.7.0-beta.7 → 3.8.0

package/src/modules/editor/src/commands/api/convertEditorWithOutput.js

@@ -1,18 +1,17 @@
-const fastGlob = require('fast-glob');
-const pMap = require('p-map');
+import fastGlob from 'fast-glob';
+import pMap from 'p-map';
 
-const WarningsByFilename = require('../../helpers/WarningsByFilename');
+import mergeIndexPageAndManifest from '../../helpers/mergeIndexPageAndManifest.js';
+import outputWarningsByFilename from '../../helpers/outputWarningsByFilename.js';
+import prettifyJsFile from '../../helpers/prettifyJsFile.js';
+import renameJsxFile from '../../helpers/renameJsxFile.js';
+import transformJsFile from '../../helpers/transformJsFile.js';
+import updateEditorPackageJson from '../../helpers/updateEditorPackageJson.js';
+import validateJsFile from '../../helpers/validateJsFile.js';
+import WarningsByFilename from '../../helpers/WarningsByFilename.js';
+import writeJsFileToDisk from '../../helpers/writeJsFileToDisk.js';
 
-const mergeIndexPageAndManifest = require('../../helpers/mergeIndexPageAndManifest');
-const outputWarningsByFilename = require('../../helpers/outputWarningsByFilename');
-const prettifyJsFile = require('../../helpers/prettifyJsFile');
-const renameJsxFile = require('../../helpers/renameJsxFile');
-const transformJsFile = require('../../helpers/transformJsFile');
-const updateEditorPackageJson = require('../../helpers/updateEditorPackageJson');
-const validateJsFile = require('../../helpers/validateJsFile');
-const writeJsFileToDisk = require('../../helpers/writeJsFileToDisk');
-
-module.exports = async function convertEditorWithOutput(
+export default async function convertEditorWithOutput(
 	outputDir,
 	doNotSaveWarnings,
 	res
@@ -68,4 +67,4 @@ module.exports = async function convertEditorWithOutput(
 		);
 		res.break();
 	}
-};
+}

package/src/modules/editor/src/commands/command.build.controller.js

@@ -1,11 +1,8 @@
-'use strict';
+import webpack from 'webpack';
 
-const webpack = require('webpack');
-const { performance } = require('perf_hooks');
-
-const getAppConfig = require('../getAppConfig');
-const getAppManifest = require('../getAppManifest');
-const getWebpackConfig = require('../getWebpackConfig');
+import getAppConfig from '../getAppConfig.js';
+import getAppManifest from '../getAppManifest.js';
+import getWebpackConfig from '../getWebpackConfig.js';
 
 function runWebpackBuild(webpackConfig) {
 	return new Promise((resolve, reject) => {
@@ -31,12 +28,12 @@ function runWebpackBuild(webpackConfig) {
 	});
 }
 
-module.exports = async function editorBuildCommand(req, res) {
+export default async function editorBuildCommand(req, res) {
 	res.caption(req.command.getLongName());
 	res.break();
 
 	const editorPath = req.fdt.editorRepository.path;
-	const appConfig = getAppConfig(editorPath, req.options);
+	const appConfig = await getAppConfig(editorPath, req.options);
 	const appManifest = await getAppManifest(editorPath);
 
 	const mangle = !req.options['no-mangle'];
@@ -60,4 +57,4 @@ module.exports = async function editorBuildCommand(req, res) {
 
 		throw error;
 	}
-};
+}

package/src/modules/editor/src/commands/command.build.js

@@ -1,11 +1,18 @@
-'use strict';
+import path from 'path';
+import { fileURLToPath } from 'url';
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
 
 const EDITOR_BUILD_DOCUMENTATION_URL =
 	'https://documentation.fontoxml.com/latest/upgrade-instructions-53f5b02b6e48';
 
-module.exports = (moduleRegistration, editorCommand) => {
+export default (moduleRegistration, editorCommand) => {
 	editorCommand
-		.addCommand('build', './command.build.controller')
+		.addCommand(
+			'build',
+			path.resolve(__dirname, 'command.build.controller.js')
+		)
 		.setDescription(
 			'Create a build of a Fonto Editor instance optimized for production usage.'
 		)

package/src/modules/editor/src/commands/command.convert.editor.controller.js

@@ -1,13 +1,11 @@
-'use strict';
+import fs from 'fs-extra';
+import path from 'path';
+import { performance } from 'perf_hooks';
+import Confirm from 'prompt-confirm';
 
-const Confirm = require('prompt-confirm');
-const fs = require('fs-extra');
-const path = require('path');
-const { performance } = require('perf_hooks');
+import convertEditorWithOutput from './api/convertEditorWithOutput.js';
 
-const convertEditorWithOutput = require('./api/convertEditorWithOutput');
-
-module.exports = async function editorConvertEditorCommand(req, res) {
+export default async function editorConvertEditorCommand(req, res) {
 	res.caption(req.command.getLongName());
 
 	const editorPath = req.fdt.editorRepository.path;
@@ -52,4 +50,4 @@ module.exports = async function editorConvertEditorCommand(req, res) {
 
 	const endTime = performance.now();
 	res.success(`\nDone. (${Math.round(endTime - startTime)} ms)`);
-};
+}

package/src/modules/editor/src/commands/command.convert.editor.js

@@ -1,8 +1,15 @@
-'use strict';
+import path from 'path';
+import { fileURLToPath } from 'url';
 
-module.exports = (_moduleRegistration, convertCommand) => {
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+
+export default (_moduleRegistration, convertCommand) => {
 	convertCommand
-		.addCommand('editor', './command.convert.editor.controller')
+		.addCommand(
+			'editor',
+			path.resolve(__dirname, 'command.convert.editor.controller.js')
+		)
 		.addAlias('app')
 		.setDescription(
 			'Convert a Fonto Editor instance from pre Fonto Editor 7.7 to a Fonto Editor 7.7 codebase.'

package/src/modules/editor/src/commands/command.convert.package.controller.js

@@ -1,22 +1,19 @@
-'use strict';
-
-const Confirm = require('prompt-confirm');
-const fastGlob = require('fast-glob');
-const fs = require('fs-extra');
-const pMap = require('p-map');
-const path = require('path');
-const { performance } = require('perf_hooks');
-
-const WarningsByFilename = require('../helpers/WarningsByFilename');
-
-const outputWarningsByFilename = require('../helpers/outputWarningsByFilename');
-const prettifyJsFile = require('../helpers/prettifyJsFile');
-const renameJsxFile = require('../helpers/renameJsxFile');
-const transformJsFile = require('../helpers/transformJsFile');
-const validateJsFile = require('../helpers/validateJsFile');
-const writeJsFileToDisk = require('../helpers/writeJsFileToDisk');
-
-module.exports = async function editorConvertPackageCommand(req, res) {
+import fastGlob from 'fast-glob';
+import fs from 'fs-extra';
+import pMap from 'p-map';
+import path from 'path';
+import { performance } from 'perf_hooks';
+import Confirm from 'prompt-confirm';
+
+import outputWarningsByFilename from '../helpers/outputWarningsByFilename.js';
+import prettifyJsFile from '../helpers/prettifyJsFile.js';
+import renameJsxFile from '../helpers/renameJsxFile.js';
+import transformJsFile from '../helpers/transformJsFile.js';
+import validateJsFile from '../helpers/validateJsFile.js';
+import WarningsByFilename from '../helpers/WarningsByFilename.js';
+import writeJsFileToDisk from '../helpers/writeJsFileToDisk.js';
+
+export default async function editorConvertPackageCommand(req, res) {
 	res.caption(req.command.getLongName());
 
 	const doNotOverwrite = req.options['no-overwrite'];
@@ -100,4 +97,4 @@ module.exports = async function editorConvertPackageCommand(req, res) {
 
 	const endTime = performance.now();
 	res.success(`\nDone. (${Math.round(endTime - startTime)} ms)`);
-};
+}

package/src/modules/editor/src/commands/command.convert.package.js

@@ -1,8 +1,15 @@
-'use strict';
+import path from 'path';
+import { fileURLToPath } from 'url';
 
-module.exports = (_moduleRegistration, convertCommand) => {
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+
+export default (_moduleRegistration, convertCommand) => {
 	convertCommand
-		.addCommand('package', './command.convert.package.controller')
+		.addCommand(
+			'package',
+			path.resolve(__dirname, 'command.convert.package.controller.js')
+		)
 		.setDescription(
 			'Convert a Fonto Editor configuration package from pre Fonto Editor 7.7 to a Fonto Editor 7.7 codebase.'
 		)

package/src/modules/editor/src/commands/command.run.controller.js

@@ -1,87 +1,76 @@
-'use strict';
-
-const compression = require('compression');
-const express = require('express');
-const middleware = require('webpack-dev-middleware');
-const webpack = require('webpack');
-
-const setupDevCms = require('../../dev-cms/setupDevCms');
-
-const getAppConfig = require('../getAppConfig');
-const getAppManifest = require('../getAppManifest');
-const getWebpackConfig = require('../getWebpackConfig');
-const getWebpackDevMiddlewareConfig = require('../getWebpackDevMiddlewareConfig');
-
-function runDistServer(appConfig, res) {
-	return new Promise((resolve, reject) => {
-		try {
-			const server = express();
-
-			server.use(compression());
-			server.use(setupDevCms(appConfig));
-
+import compression from 'compression';
+import express from 'express';
+import webpack from 'webpack';
+import middleware from 'webpack-dev-middleware';
+
+import setupDevCms from '../../dev-cms/setupDevCms.js';
+import getAppConfig from '../getAppConfig.js';
+import getAppManifest from '../getAppManifest.js';
+import getWebpackConfig from '../getWebpackConfig.js';
+import getWebpackDevMiddlewareConfig from '../getWebpackDevMiddlewareConfig.js';
+
+async function runDistServer(appConfig, res) {
+	try {
+		const server = express();
+		server.use(compression());
+		server.use(await setupDevCms(appConfig));
+
+		await new Promise((resolve, reject) => {
 			server.listen(appConfig.port, (error) => {
 				if (error) {
 					reject(error);
 					return;
 				}
-
 				resolve();
 			});
-		} catch (error) {
-			res.destroyAllSpinners();
-			res.break();
-			res.error(
-				'An error occurred while starting the development server.'
-			);
-			throw error;
-		}
-	});
+		});
+	} catch (error) {
+		res.destroyAllSpinners();
+		res.break();
+		res.error('An error occurred while starting the development server.');
+		throw error;
+	}
 }
 
-function runWebpackDevServer(webpackConfig, appConfig, res) {
+async function runWebpackDevServer(webpackConfig, appConfig, res) {
 	const compiler = webpack(webpackConfig);
 
 	// Server has not actually started, but for the sake of output, it is done.
 	res.destroyAllSpinners();
 	res.break();
 
-	return new Promise((resolve, reject) => {
-		try {
-			const server = express();
-
-			server.use(compression());
-			server.use(setupDevCms(appConfig));
-			server.use(
-				middleware(compiler, getWebpackDevMiddlewareConfig(appConfig))
-			);
+	try {
+		const server = express();
+		server.use(compression());
+		server.use(await setupDevCms(appConfig));
+		server.use(
+			middleware(compiler, getWebpackDevMiddlewareConfig(appConfig))
+		);
 
+		await new Promise((resolve, reject) => {
 			server.listen(appConfig.port, '0.0.0.0', (error) => {
 				if (error) {
 					reject(error);
 					return;
 				}
-
 				server.on('close', () => {
 					resolve();
 				});
 			});
-		} catch (error) {
-			res.destroyAllSpinners();
-			res.break();
-			res.error(
-				'An error occurred while starting the development server.'
-			);
-			throw error;
-		}
-	});
+		});
+	} catch (error) {
+		res.destroyAllSpinners();
+		res.break();
+		res.error('An error occurred while starting the development server.');
+		throw error;
+	}
 }
 
-module.exports = async function editorRunCommand(req, res) {
+export default async function editorRunCommand(req, res) {
 	res.caption(req.command.getLongName());
 
 	const editorPath = req.fdt.editorRepository.path;
-	const appConfig = getAppConfig(editorPath, req.options);
+	const appConfig = await getAppConfig(editorPath, req.options);
 	const appManifest = await getAppManifest(editorPath);
 
 	// Output most app config values.
@@ -174,4 +163,4 @@ module.exports = async function editorRunCommand(req, res) {
 	res.spinner('Starting development server...');
 
 	await runWebpackDevServer(webpackConfig, appConfig, res);
-};
+}

package/src/modules/editor/src/commands/command.run.js

@@ -1,11 +1,18 @@
-'use strict';
+import path from 'path';
+import { fileURLToPath } from 'url';
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
 
 const EDITOR_RUN_DOCUMENTATION_URL =
 	'https://documentation.fontoxml.com/latest/development-server-4fe6e4d66c2a';
 
-module.exports = (moduleRegistration, editorCommand) => {
+export default (moduleRegistration, editorCommand) => {
 	editorCommand
-		.addCommand('run', './command.run.controller')
+		.addCommand(
+			'run',
+			path.resolve(__dirname, './command.run.controller.js')
+		)
 		.setDescription(
 			'Start a development server for running a Fonto Editor instance.'
 		)

package/src/modules/editor/src/config.js

@@ -1,115 +1,115 @@
-module.exports = {
-	defaultBabelPlugins: [
-		// Cleanup
-		'cleanupRegisterXQueryModulePlugin',
+export const defaultBabelPlugins = [
+	// Cleanup
+	'cleanupRegisterXQueryModulePlugin',
 
-		// Convert code
-		'convertAmdToEsmPlugin',
-		'rewriteConfigImportsPlugin',
-		'rewriteImportFileExtensionPlugin',
-		'rewriteInteropDefaultPlugin',
-		'rewriteJsonLoaderPlugin',
-		'rewriteMainJsImportsPlugin',
-		'rewriteSrcPathPlugin',
-		'rewriteSvgLoaderPlugin.js',
-	],
+	// Convert code
+	'convertAmdToEsmPlugin',
+	'rewriteConfigImportsPlugin',
+	'rewriteImportFileExtensionPlugin',
+	'rewriteInteropDefaultPlugin',
+	'rewriteJsonLoaderPlugin',
+	'rewriteMainJsImportsPlugin',
+	'rewriteSrcPathPlugin',
+	'rewriteSvgLoaderPlugin',
+];
 
-	defaultBabelValidationPlugins: ['validatePlugin'],
+export const defaultBabelValidationPlugins = ['validatePlugin'];
 
-	importAliases: [
-		{
-			alias: 'diff',
-			devImport: 'fontoxml-vendors/src/diff',
-			import: 'fontoxml-vendors/src/diff.min',
-		},
-		{
-			alias: 'diff-match-patch',
-			import: 'fontoxml-vendors/src/diff-match-patch',
-		},
-		{
-			alias: 'fds/components',
-			import: 'fontoxml-vendors/src/fds/components',
-		},
-		{
-			alias: 'fds/lib/bundle',
-			import: 'fontoxml-vendors/src/fds/lib/bundle',
-		},
-		{ alias: 'fds/system', import: 'fontoxml-vendors/src/fds/system' },
-		{
-			alias: 'fonto-xml-parser',
-			import: 'fontoxml-vendors/src/fonto-xml-parser/fonto-xml-parser',
-		},
-		{ alias: 'fontoxpath', import: 'fontoxml-vendors/src/fontoxpath' },
-		{
-			alias: 'fontoxpath-cache',
-			import: 'fontoxml-vendors/src/fontoxpath-cache',
-		},
-		{ alias: 'glamor', import: 'fontoxml-vendors/src/glamor' },
-		{
-			alias: 'messageformat',
-			devImport: 'fontoxml-vendors/src/messageformat',
-			import: 'fontoxml-vendors/src/messageformat.min',
-		},
-		{
-			alias: 'prop-types',
-			devImport: 'fontoxml-vendors/src/prop-types',
-			import: 'fontoxml-vendors/src/prop-types.min',
-		},
-		{
-			alias: 'react',
-			devImport: 'fontoxml-vendors/src/react',
-			import: 'fontoxml-vendors/src/react.min',
-		},
-		{
-			alias: 'react-dnd',
-			devImport: 'fontoxml-vendors/src/ReactDnD',
-			import: 'fontoxml-vendors/src/ReactDnD.min',
-		},
-		{
-			alias: 'react-dnd-html5-backend',
-			devImport: 'fontoxml-vendors/src/ReactDnDHTML5Backend',
-			import: 'fontoxml-vendors/src/ReactDnDHTML5Backend.min',
-		},
-		{
-			alias: 'react-dom',
-			devImport: 'fontoxml-vendors/src/react-dom',
-			import: 'fontoxml-vendors/src/react-dom.min',
-		},
-		{
-			alias: 'react-router-dom',
-			devImport: 'fontoxml-vendors/src/react-router-dom',
-			import: 'fontoxml-vendors/src/react-router-dom.min',
-		},
-		{
-			alias: 'react-spring',
-			import: 'fontoxml-vendors/src/react-spring',
-		},
-		{
-			alias: 'resize-observer-polyfill',
-			import: 'fontoxml-vendors/src/ResizeObserver',
-		},
-		{ alias: 'slimdom', import: 'fontoxml-vendors/src/slimdom' },
-		{ alias: 'superagent', import: 'fontoxml-vendors/src/superagent' },
-		{ alias: 'unicodejs', import: 'fontoxml-vendors/src/unicodejs' },
-		{ alias: 'whynot', import: 'fontoxml-vendors/src/whynot' },
-		{ alias: 'xspattern', import: 'fontoxml-vendors/src/xspattern' },
-	],
-	mainJsModuleNames: [
-		'fontoxml-base-flow',
-		'fontoxml-block-flow',
-		'fontoxml-blueprints',
-		'fontoxml-core',
-		'fontoxml-dom-utils',
-		'fontoxml-schema-experience',
-		'fontoxml-sectioning-flow',
-		'fontoxml-shims',
-		'fontoxml-templated-views',
-	],
-	namedExportModuleNames: [
-		'fds/components',
-		'fds/system',
-		'fontoxpath-cache',
-		'glamor',
-		'slimdom',
-	],
-};
+export const importAliases = [
+	{
+		alias: 'diff',
+		devImport: 'fontoxml-vendors/src/diff',
+		import: 'fontoxml-vendors/src/diff.min',
+	},
+	{
+		alias: 'diff-match-patch',
+		import: 'fontoxml-vendors/src/diff-match-patch',
+	},
+	{
+		alias: 'fds/components',
+		import: 'fontoxml-vendors/src/fds/components',
+	},
+	{
+		alias: 'fds/lib/bundle',
+		import: 'fontoxml-vendors/src/fds/lib/bundle',
+	},
+	{ alias: 'fds/system', import: 'fontoxml-vendors/src/fds/system' },
+	{
+		alias: 'fonto-xml-parser',
+		import: 'fontoxml-vendors/src/fonto-xml-parser/fonto-xml-parser',
+	},
+	{ alias: 'fontoxpath', import: 'fontoxml-vendors/src/fontoxpath' },
+	{
+		alias: 'fontoxpath-cache',
+		import: 'fontoxml-vendors/src/fontoxpath-cache',
+	},
+	{ alias: 'glamor', import: 'fontoxml-vendors/src/glamor' },
+	{
+		alias: 'messageformat',
+		devImport: 'fontoxml-vendors/src/messageformat',
+		import: 'fontoxml-vendors/src/messageformat.min',
+	},
+	{
+		alias: 'prop-types',
+		devImport: 'fontoxml-vendors/src/prop-types',
+		import: 'fontoxml-vendors/src/prop-types.min',
+	},
+	{
+		alias: 'react',
+		devImport: 'fontoxml-vendors/src/react',
+		import: 'fontoxml-vendors/src/react.min',
+	},
+	{
+		alias: 'react-dnd',
+		devImport: 'fontoxml-vendors/src/ReactDnD',
+		import: 'fontoxml-vendors/src/ReactDnD.min',
+	},
+	{
+		alias: 'react-dnd-html5-backend',
+		devImport: 'fontoxml-vendors/src/ReactDnDHTML5Backend',
+		import: 'fontoxml-vendors/src/ReactDnDHTML5Backend.min',
+	},
+	{
+		alias: 'react-dom',
+		devImport: 'fontoxml-vendors/src/react-dom',
+		import: 'fontoxml-vendors/src/react-dom.min',
+	},
+	{
+		alias: 'react-router-dom',
+		devImport: 'fontoxml-vendors/src/react-router-dom',
+		import: 'fontoxml-vendors/src/react-router-dom.min',
+	},
+	{
+		alias: 'react-spring',
+		import: 'fontoxml-vendors/src/react-spring',
+	},
+	{
+		alias: 'resize-observer-polyfill',
+		import: 'fontoxml-vendors/src/ResizeObserver',
+	},
+	{ alias: 'slimdom', import: 'fontoxml-vendors/src/slimdom' },
+	{ alias: 'superagent', import: 'fontoxml-vendors/src/superagent' },
+	{ alias: 'unicodejs', import: 'fontoxml-vendors/src/unicodejs' },
+	{ alias: 'whynot', import: 'fontoxml-vendors/src/whynot' },
+	{ alias: 'xspattern', import: 'fontoxml-vendors/src/xspattern' },
+];
+
+export const mainJsModuleNames = [
+	'fontoxml-base-flow',
+	'fontoxml-block-flow',
+	'fontoxml-blueprints',
+	'fontoxml-core',
+	'fontoxml-dom-utils',
+	'fontoxml-schema-experience',
+	'fontoxml-sectioning-flow',
+	'fontoxml-shims',
+	'fontoxml-templated-views',
+];
+
+export const namedExportModuleNames = [
+	'fds/components',
+	'fds/system',
+	'fontoxpath-cache',
+	'glamor',
+	'slimdom',
+];